Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-08-03 14:56:03 +00:00
commit 8b1650c382

View File

@ -57,7 +57,7 @@
"bluebird": "^3.5.0", "bluebird": "^3.5.0",
"browser-request": "^0.3.3", "browser-request": "^0.3.3",
"classnames": "^2.1.2", "classnames": "^2.1.2",
"draft-js": "^0.10.1", "draft-js": "^0.11.0-alpha",
"extract-text-webpack-plugin": "^0.9.1", "extract-text-webpack-plugin": "^0.9.1",
"favico.js": "^0.3.10", "favico.js": "^0.3.10",
"filesize": "3.5.6", "filesize": "3.5.6",