Merge branch 'master' into issue-1334

# Conflicts: # .gitignore # make-webpack-config.js
2017-08-02 20:14:03 +02:00
parent 7cb6bdd7f4 ad8bad6ddc
commit b7bbead9c7
96 changed files with 2597 additions and 1045 deletions
--- a/package.json
+++ b/package.json
@@ -116,7 +116,6 @@
    "karma-sourcemap-loader": "^0.3.7",
    "karma-webpack": "2.0.3",
    "less": "2.7.2",
-    "less-loader": "4.0.4",
    "license-checker": "^11.0.0",
    "mocha": "^3.4.2",
    "nightwatch": "^0.9.16",