Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2026-03-10 15:42:34 +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
package.json
View file

@ -37,6 +37,7 @@
"lodash": "^4.12.0",
"ng2-bootstrap": "^1.0.20",
"ng2-ckeditor": "^1.0.4",
"ng2-branchy": "0.0.2-2",
"ng2-uploader": "^0.5.2",
"normalize.css": "^4.1.1",
"rxjs": "5.0.0-beta.6",