Commit Graph

5 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
mhartington
4bd6ac825d docs(): docs 2015-12-02 17:55:56 -05:00
Max Lynch
b71c4e137e Translate 2015-09-28 15:21:06 -05:00
Max Lynch
6fd4b5f323 feat(translation): Translate pipe 2015-09-25 12:18:51 -05:00
Max Lynch
c3ea116046 feat(i18n): translation service 2015-09-25 11:56:54 -05:00