Merge branch master into PHRAS-2430

This commit is contained in:
Harrys Ravalomanana
2019-04-05 15:11:09 +04:00
25 changed files with 2077 additions and 1732 deletions

View File

@@ -66,7 +66,7 @@
"normalize-css": "^2.1.0",
"npm": "^6.0.0",
"npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.33.99",
"phraseanet-production-client": "^0.34.2",
"requirejs": "^2.3.5",
"tinymce": "^4.0.28",
"underscore": "^1.8.3",