Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

This commit is contained in:
yflory 2017-07-20 18:32:12 +02:00
commit 469f49fc0a

File diff suppressed because one or more lines are too long