Merge branch 'bootstrap-refactor' into 2.0

This commit is contained in:
Adam Bradley
2016-05-31 15:50:21 -05:00
198 changed files with 1644 additions and 1637 deletions

View File

@@ -138,6 +138,6 @@
</ion-menu>
<ion-nav id="nav" [root]="rootPage" #content></ion-nav>
<ion-nav [root]="rootPage" #content></ion-nav>
<div [hidden]="isChangeDetecting()"></div>