Merge conflicts

This commit is contained in:
n1474335 2017-05-06 13:47:26 +01:00
commit 03fc22d3da
11 changed files with 218 additions and 13 deletions

View file

@ -51,6 +51,7 @@
"html-webpack-plugin": "^2.28.0",
"imports-loader": "^0.7.1",
"ink-docstrap": "^1.1.4",
"jsdoc-babel": "^0.3.0",
"less": "^2.7.2",
"less-loader": "^4.0.2",
"style-loader": "^0.15.0",