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

pull/1/head
Caleb James DeLisle 2017-08-16 10:19:50 +02:00
commit 40287f973c
1 changed files with 2 additions and 0 deletions

View File

@ -9,3 +9,5 @@ www/scratch
www/common/toolbar.js
www/common/hyperscript.js
www/common/tippy.min.js
www/pad/wysiwygarea-plugin.js