purchasing/fuse-angular
3
0
Fork 0
mirror of https://github.com/richard-loafle/fuse-angular.git synced 2026-03-25 19:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into scrumboard-app

Browse Source 
# Conflicts:
#	package.json
#	src/app/core/modules/shared.module.ts
This commit is contained in:
mustafahlvc
2017-08-30 14:19:45 +03:00
parent cd99fbf77a a56e9e6d10
commit a0da9bd81e
60 changed files with 1225 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/core/modules/material.module.ts
View File

@@ -32,7 +32,7 @@ import {
MdTableModule,
MdTabsModule
} from '@angular/material';
import { CdkTableModule } from '@angular/cdk';
import { CdkTableModule } from '@angular/cdk/table';
@NgModule({
imports: [

2
src/app/core/modules/shared.module.ts
View File

@@ -21,6 +21,7 @@ import { FuseHljsComponent } from '../components/hljs/hljs.component';
import { FuseIfOnDomDirective } from '../directives/fuse-if-on-dom/fuse-if-on-dom.directive';
import { FuseMaterialColorPickerComponent } from '../components/material-color-picker/material-color-picker.component';
import { Md2Module } from 'md2';
import { CookieService } from 'ngx-cookie-service';
@NgModule({
declarations : [
@@ -68,6 +69,7 @@ import { Md2Module } from 'md2';
FuseConfirmDialogComponent
],
providers : [
CookieService,
FuseNavigationService,
FuseMatchMedia,
FuseNavbarService,