Merge branch '2.0' into windows-mode

This commit is contained in:
Brandy Carney
2016-02-22 20:38:50 -05:00
107 changed files with 129 additions and 121 deletions

View File

@ -15,8 +15,12 @@
<script>
System.config({
map: {
angular2: '/angular2',
ionic: '/ionic'
'angular2': '/angular2'
},
packages: {
'ionic-angular': {
main: 'index'
}
}
});
</script>

View File

@ -42,8 +42,12 @@
<script>
System.config({
map: {
angular2: '/angular2',
ionic: '/ionic'
'angular2': '/angular2'
},
packages: {
'ionic-angular': {
main: 'index'
}
}
});
</script>