Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,821 Commits 64 Branches 1,256 Tags
e86809dc07fbe6bdbbbbdcfe9a81d583cf43cab7
Commit Graph

5 Commits

Author SHA1 Message Date
Sabe Jones 41b4d497f7 Merge branch 'develop' into sabrecat/pet-201509 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith2.css
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
 2015-09-08 13:25:10 -05:00
Blade Barringer 898ea845b3 Convert translation function to js 2015-09-06 16:20:14 -05:00
Blade Barringer 4081a9a62a Add faq to content 2015-09-06 16:08:53 -05:00
Blade Barringer 8a06514c72 Move translation function to separate module 2015-09-06 15:54:38 -05:00
Blade Barringer b9bbc3f1ea Move content to own directory 2015-09-06 15:31:08 -05:00