Merge remote-tracking branch 'origin/master'

This commit is contained in:
nixa 2016-09-01 19:46:49 +03:00
commit 7ed50245bd

View file

@ -30,7 +30,7 @@
"easy-pie-chart": "^2.1.7",
"extract-text-webpack-plugin": "2.0.0-beta.3",
"font-awesome": "^4.6.1",
"font-awesome-sass-loader": "^1.0.1",
"font-awesome-sass-loader": "^1.0.2",
"fullcalendar": "^2.7.2",
"google-maps": "^3.2.1",
"http-server": "^0.9.0",