Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2025-12-17 07:50:12 +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

2
src/platform/browser/directives.ts
View file

@ -5,7 +5,7 @@
import {PLATFORM_DIRECTIVES} from '@angular/core';
// Angular 2 Router
import {ROUTER_DIRECTIVES} from '@angular/router-deprecated';
import {ROUTER_DIRECTIVES} from '@angular/router';
// Angular 2 forms
import { REACTIVE_FORM_DIRECTIVES } from '@angular/forms';