2 Commits

Author	SHA1	Message	Date
Brandy Carney	ff8169cb0a	Merge branch 'master' into searchbar-fix ... # Conflicts: # ionic/components/searchbar/searchbar.ts	2015-12-10 17:55:44 -05:00
Adam Bradley	89c0a0ef09	refactor(): rename ViewController/ViewItem ... Rename ViewController to NavController, ViewItem to ViewController	2015-09-23 16:57:25 -05:00