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 'Tibing-dev-tree-view' into develop/tree

Browse source 
Conflicts:
	config/webpack.common.js
	package.json
	src/app/app.menu.ts
	src/app/pages/pages.component.ts
This commit is contained in:
nixa 2016-07-12 12:09:19 +03:00
commit 85a9f86186
10 changed files with 100 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/webpack.common.js
View file

@ -89,6 +89,7 @@ module.exports = {
// these packages have problems with their sourcemaps
helpers.root('node_modules/rxjs'),
helpers.root('node_modules/ng2-bootstrap'),
helpers.root('node_modules/ng2-branchy')
]
}