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

Merge branch 'master' of https://github.com/akveo/ng2-admin

Browse source 
# Conflicts:
#	src/app/theme/components/baSidebar/baSidebar.service.ts
This commit is contained in:
Ronny Roos 2016-06-29 22:25:14 +02:00
commit 8363102475
6 changed files with 55 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

22
package.json
View file

@ -1,19 +1,19 @@
{
"name": "ng2-admin",
"version": "0.2.1",
"version": "0.3.0",
"description": "Angular 2 and Bootstrap 4 Admin Template.",
"author": "akveo",
"homepage": "http://akveo.github.io/ng2-admin/",
"license": "MIT",
"dependencies": {
"@angular/common": "2.0.0-rc.2",
"@angular/compiler": "2.0.0-rc.2",
"@angular/core": "2.0.0-rc.2",
"@angular/http": "2.0.0-rc.2",
"@angular/platform-browser": "2.0.0-rc.2",
"@angular/platform-browser-dynamic": "2.0.0-rc.2",
"@angular/platform-server": "2.0.0-rc.2",
"@angular/router": "2.0.0-rc.2",
"@angular/common": "2.0.0-rc.3",
"@angular/compiler": "2.0.0-rc.3",
"@angular/core": "2.0.0-rc.3",
"@angular/http": "2.0.0-rc.3",
"@angular/platform-browser": "2.0.0-rc.3",
"@angular/platform-browser-dynamic": "2.0.0-rc.3",
"@angular/platform-server": "2.0.0-rc.3",
"@angular/router": "3.0.0-alpha.8",
"@angular/router-deprecated": "2.0.0-rc.2",
"amcharts3": "github:amcharts/amcharts3",
"ammap3": "github:amcharts/ammap3",
@ -42,7 +42,7 @@
},
"devDependencies": {
"angular2-hmr": "~0.7.0",
"awesome-typescript-loader": "^1.0.0",
"awesome-typescript-loader": "1.1.1",
"codelyzer": "~0.0.19",
"compression-webpack-plugin": "^0.3.1",
"copy-webpack-plugin": "^3.0.1",
@ -71,7 +71,7 @@
"ts-node": "^0.9.0",
"tslint": "^3.7.1",
"tslint-loader": "^2.1.3",
"typedoc": "^0.4.2",
"typedoc": "^0.4.4",
"typescript": "~1.8.9",
"typings": "^1.0.5",
"url-loader": "^0.5.7",