Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2026-01-11 03:58:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop/uploader'

Browse source 
Conflicts:
	package.json
This commit is contained in:
nixa 2016-07-01 15:30:32 +03:00
commit e72467a00d
8 changed files with 240 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -36,6 +36,7 @@
"lodash": "^4.12.0",
"ng2-bootstrap": "^1.0.16",
"ng2-ckeditor": "^1.0.3",
"ng2-uploader": "^0.5.2",
"normalize.css": "^4.1.1",
"rxjs": "5.0.0-beta.6",
"tether": "^1.2.4",