Merge branch '2.0' into windows-mode

2026-03-13 10:22:08 +08:00 · 2016-02-23 13:43:05 -05:00
parent 6af9b7780b c75be0b146
commit 6cd0c45f7c
7 changed files with 67 additions and 25 deletions
--- a/scripts/karma/system.config.js
+++ b/scripts/karma/system.config.js
@@ -1,6 +1,10 @@
 System.config({
  map: {
-    angular2: '/base/angular2',
-    ionic: '/base/ionic'
+    'angular2': '/base/angular2'
+  },
+  packages: {
+    'ionic-angular': {
+      main: 'index'
+    }
  }
 });