merge of master

This commit is contained in:
Harrys Ravalomanana
2020-01-29 10:31:44 +04:00
parent f29be7f07b
commit de2f8dc588
11 changed files with 1885 additions and 1840 deletions

View File

@@ -65,7 +65,7 @@
"normalize-css": "^2.1.0",
"npm": "^6.0.0",
"npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.111-d",
"phraseanet-production-client": "0.34.115-d",
"requirejs": "^2.3.5",
"tinymce": "^4.0.28",
"underscore": "^1.8.3",