Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2026-01-19 07:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop/router

Browse source 
Conflicts:
	package.json
This commit is contained in:
nixa 2016-07-08 13:16:37 +03:00
commit 5b66c255ad
9 changed files with 48 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -14,6 +14,7 @@
"@angular/platform-browser-dynamic": "2.0.0-rc.4",
"@angular/platform-server": "2.0.0-rc.4",
"@angular/router": "3.0.0-beta.2",
"@angular/forms":"0.2.0",
"amcharts3": "github:amcharts/amcharts3",
"ammap3": "github:amcharts/ammap3",
"animate.css": "^3.5.1",