Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2026-01-15 22:15:30 +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

3
src/app/theme/components/baCard/baCard.component.ts
View file

@ -1,5 +1,4 @@
import {Component, ViewEncapsulation, Input} from '@angular/core';
import {Component, ViewEncapsulation, ViewChild, Input} from '@angular/core';
import {BaCardBlur} from './baCardBlur.directive';
@Component({

3
src/app/theme/components/baCard/index.ts
View file

@ -1,2 +1 @@
export * from './baCard.component.ts';
export * from './baCardBlur.directive';
export * from './baCard.component';