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

7 years ago · 92ea3593cd
parent 8ce364a252 937d323780
commit 92ea3593cd
1 changed files with 2 additions and 1 deletions
--- a/.jshintignore
+++ b/.jshintignore
@ -11,6 +11,7 @@ www/common/hyperscript.js
 www/common/tippy.min.js

 www/pad/wysiwygarea-plugin.js
-www/pad2/wysiwygarea-plugin.js
+www/pad/mediatag-plugin.js
+www/pad/mediatag-plugin-dialog.js

 www/common/media-tag-nacl.min.js