Merge branch 'alpha37'

This commit is contained in:
Adam Bradley
2015-09-11 21:04:02 -05:00
53 changed files with 101 additions and 327 deletions

View File

@@ -15,7 +15,17 @@
<script src="../../js/ionic.bundle.js"></script>
<script>System.import("index");</script>
<script>
System.config({
"paths": {
"*": "*.js",
"ionic/*": "ionic/*",
"angular2/*": "angular2/*",
"rx": "rx"
}
})
System.import("index");
</script>
</body>
</html>

View File

@@ -53,7 +53,17 @@
<script src="../../../js/ionic.bundle.js"></script>
<script>System.import("index");</script>
<script>
System.config({
"paths": {
"*": "*.js",
"ionic/*": "ionic/*",
"angular2/*": "angular2/*",
"rx": "rx"
}
})
System.import("index");
</script>
</body>
</html>