Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2026-02-10 02:14:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop/router'

Browse source 
Conflicts:
	src/platform/browser/directives.ts
	src/platform/browser/providers.ts
This commit is contained in:
nixa 2016-07-12 10:37:24 +03:00
commit 660aa8a4b6
33 changed files with 616 additions and 550 deletions
Download patch file Download diff file Expand all files Collapse all files

3
package.json
View file

@ -13,8 +13,7 @@
"@angular/platform-browser": "2.0.0-rc.4",
"@angular/platform-browser-dynamic": "2.0.0-rc.4",
"@angular/platform-server": "2.0.0-rc.4",
"@angular/router": "3.0.0-alpha.8",
"@angular/router-deprecated": "2.0.0-rc.2",
"@angular/router": "3.0.0-beta.2",
"@angular/forms":"0.2.0",
"amcharts3": "github:amcharts/amcharts3",
"ammap3": "github:amcharts/ammap3",