habitica/website
Negue 1cc07129f1 Merge branch 'develop' into pushNotifications2
Conflicts:
	test/api.mocha.coffee
2015-05-10 22:01:41 +02:00
..
public Correct bullet list position; fixes #5181 2015-05-10 14:16:11 -05:00
src Merge branch 'develop' into pushNotifications2 2015-05-08 23:21:18 +02:00
views Correct casing of translatable string 2015-05-10 09:13:05 -05:00