Merge branch 'alpha50' into css-refactor

This commit is contained in:
Adam Bradley
2015-12-09 07:47:30 -06:00
27 changed files with 71 additions and 49 deletions

View File

@@ -86,7 +86,7 @@
"*": "*.js",
"ionic/*": "ionic/*",
"angular2/*": "angular2/*",
"rx": "rx"
"rxjs/*": "rxjs/*"
}
})
System.import("index").then(function(m) {}, console.error.bind(console));