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

This commit is contained in:
Weblate 2017-10-20 16:11:26 +00:00
commit b33998c1f9
2 changed files with 9513 additions and 1 deletions

9512
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -132,7 +132,7 @@
"minimist": "^1.2.0",
"mkdirp": "^0.5.1",
"mocha": "^2.4.5",
"parallelshell": "^1.2.0",
"parallelshell": "^3.0.2",
"postcss-extend": "^1.0.5",
"postcss-import": "^9.0.0",
"postcss-loader": "^1.2.2",