Brandy Carney ff8169cb0a Merge branch 'master' into searchbar-fix ...

# Conflicts:
#	ionic/components/searchbar/searchbar.ts

2015-12-10 17:55:44 -05:00

..

test

Merge branch 'master' into searchbar-fix

2015-12-10 17:55:44 -05:00

nav-controller.ts

Merge branch 'master' into searchbar-fix

2015-12-10 17:55:44 -05:00

nav-push.ts

Merge branch 'master' into searchbar-fix

2015-12-10 17:55:44 -05:00

nav-registry.ts

update NavRegistry views -> pages

2015-10-07 14:23:16 -05:00

nav-router.ts

Merge branch 'master' into searchbar-fix

2015-12-10 17:55:44 -05:00

nav.ts

Merge branch 'master' into searchbar-fix

2015-12-10 17:55:44 -05:00

swipe-back.ts

Merge branch 'master' into searchbar-fix

2015-12-10 17:55:44 -05:00

view-controller.ts

docs(): nav-controller and view-controller

2015-12-07 10:43:11 -05:00