habitica/locales/en
Tyler Renelle dcfa9e4724 Merge remote-tracking branch 'ryepdx/conText-bug' into develop
Conflicts:
	locales/en/main.json
2014-01-26 17:07:06 -08:00
..
app.json fic(translations): remove string for terms and privacy 2014-01-24 17:39:11 +01:00
main.json Merge remote-tracking branch 'ryepdx/conText-bug' into develop 2014-01-26 17:07:06 -08:00