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

7 years ago · 40287f973c
parent b0b1ed037c 9a6bf302b4
commit 40287f973c
1 changed files with 2 additions and 0 deletions
--- a/.jshintignore
+++ b/.jshintignore
@ -9,3 +9,5 @@ www/scratch
 www/common/toolbar.js
 www/common/hyperscript.js
 www/common/tippy.min.js
+
+www/pad/wysiwygarea-plugin.js