Merge branch 'master' into feature/issue-template

ubiquits · Jul 7, 2016 · 47f995e · 47f995e
2 parents 85e8b36 + e5ddb4b
commit 47f995e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ubiquits/core",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "description": "ubiquits core",
   "main": "lib/index.js",
   "typings": "index.d.ts",
@@ -56,7 +56,7 @@
     "zone.js": "^0.6.12"
   },
   "devDependencies": {
-    "@ubiquits/toolchain": "^0.1.40",
+    "@ubiquits/toolchain": "^0.1.42",
     "proxyquire": "^1.7.10"
   },
   "directories": {

diff --git a/src/common/registry/entityRegistry.ts b/src/common/registry/entityRegistry.ts
@@ -4,7 +4,6 @@
 /** End Typedoc Module Declaration */
 import * as _ from 'lodash';
 import { ModelMetadata, initializeMetadata, ControllerMetadata } from '../metadata/metadata';
-import { ControllerBootstrapper } from '../../server/bootstrap/controllers.bootstrapper';
 
 export type EntityType = 'model' | 'controller' | 'seeder' | 'migration' | 'store' | 'service';
 export type EntityMetadata = ModelMetadata | ControllerMetadata;