Commit graph

7 commits

Author SHA1 Message Date
Andrew Cham
bf64c6503d #6779 Update community guidelines 2016-02-27 02:47:58 -08:00
lacrimae
49891d311f HabitRPG -> Habitica where missed 2015-07-31 09:20:20 +02:00
Blade Barringer
e28bd5bc57 Update English strings 2015-07-30 21:36:09 -05:00
NotGonnaGitUs
a45390321e Patched translation fixes and added a few phrases to locales. 2015-05-03 23:41:42 +05:30
Blade Barringer
4b8b7bc87d Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-09 22:40:15 -06:00
Blade Barringer
88be8f3274 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
	common/img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
	common/img/sprites/spritesmith/npcs/npc_bailey_broken.png
	common/img/sprites/spritesmith/npcs/npc_justin_broken.png
	common/img/sprites/spritesmith/npcs/npc_matt_broken.png
	img/sprites/spritesmith/gear/events/birthday/broad_armor_special_birthday2015.png
	img/sprites/spritesmith/gear/events/birthday/shop_armor_special_birthday2015.png
	img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
	img/sprites/spritesmith/npcs/npc_bailey_broken.png
	img/sprites/spritesmith/npcs/npc_justin_broken.png
	img/sprites/spritesmith/quests/inventory_quest_scroll_penguin.png
2015-02-01 14:07:18 -06:00
Blade Barringer
c91b0cd34a Moved folders into common directory 2015-01-21 10:34:04 -06:00
Renamed from locales/en/communityGuidelines.json (Browse further)