2 Commits

Author SHA1 Message Date
ff8169cb0a Merge branch 'master' into searchbar-fix
# Conflicts:
#	ionic/components/searchbar/searchbar.ts
2015-12-10 17:55:44 -05:00
1ae3113386 let there be typescript 2015-07-03 13:19:30 -05:00