Merge branch 'master' into list-border-refactor

Conflicts: ionic/util/dom.ts
2026-03-13 10:22:08 +08:00 · 2015-11-05 19:16:24 -05:00
parent 53164b41ca 0a06357de6
commit 697e92ebcb
10 changed files with 72 additions and 48 deletions
--- a/ionic/components/nav/test/basic/index.ts
+++ b/ionic/components/nav/test/basic/index.ts
@@ -206,6 +206,7 @@ class AnotherPage {


@App({
+  pages: [FirstPage, FullPage, PrimaryHeaderPage, AnotherPage],
  template: `<ion-nav [root]="root"></ion-nav>`
 })
 class E2EApp {