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

This commit is contained in:
Weblate 2018-04-09 13:12:22 +00:00
commit 4d6dc14156

View file

@ -143,7 +143,7 @@
"react-addons-perf": "^15.4.0", "react-addons-perf": "^15.4.0",
"react-addons-test-utils": "^15.6.0", "react-addons-test-utils": "^15.6.0",
"rimraf": "^2.4.3", "rimraf": "^2.4.3",
"source-map-loader": "^0.1.5", "source-map-loader": "^0.2.3",
"webpack": "^1.12.14", "webpack": "^1.12.14",
"webpack-dev-server": "^1.16.2" "webpack-dev-server": "^1.16.2"
}, },