Merge branch 'development' into develop/ng2-smart-table-int

This commit is contained in:
nixa 2016-08-22 19:48:46 +03:00
commit 5bc3448a3c
15 changed files with 11 additions and 52 deletions

View file

@ -32,6 +32,7 @@
"google-maps": "^3.2.1",
"http-server": "^0.9.0",
"ie-shim": "^0.1.0",
"ionicons": "^2.0.1",
"jquery": "^2.2.3",
"jquery-slimscroll": "^1.3.6",
"leaflet": "^0.7.7",
@ -130,7 +131,6 @@
"gh-pages": "wintersmith build -C docs && gh-pages -d docs/build",
"start": "npm run server:dev",
"start:hmr": "npm run server:dev:hmr",
"postinstall": "bower install",
"version": "npm run build",
"postversion": "git push && git push --tags"
},