4 Commits

Author	SHA1	Message	Date
ansuz	b3e066eaca	show loading screen tips during loading screen	2017-09-26 10:59:25 +02:00
Caleb James DeLisle	b24e9b84af	Manual merge, update the CSS in loading.js and document that loading.less does nothing.	2017-09-14 10:48:35 +02:00
ansuz	2797a77f5d	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-09-13 18:18:45 +02:00
yflory	d360e2d0f4	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-09-13 16:20:26 +02:00