Merge remote-tracking branch 'origin/master'

This commit is contained in:
nixa 2016-07-04 18:06:34 +03:00
commit 9d539d93f8
3 changed files with 2 additions and 5 deletions

View file

@ -22,6 +22,7 @@
"bootstrap-loader": "^1.0.8",
"chart.js": "^1.1.1",
"chartist": "^0.9.7",
"ckeditor": "^4.5.9",
"core-js": "^2.4.0",
"easy-pie-chart": "^2.1.7",
"extract-text-webpack-plugin": "^1.0.1",