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

pull/1/head
yflory 2017-07-20 18:32:12 +02:00
commit 469f49fc0a
1 changed files with 1 additions and 1 deletions

File diff suppressed because one or more lines are too long