Commit Graph

7 Commits

Author SHA1 Message Date
Matteo Pagliazzi a1fb1468ba chore(i18n): update locales 2015-05-05 19:52:20 +02:00
Matteo Pagliazzi 4fe740a403 chore(i18n): update locales 2015-04-13 19:31:53 +02:00
Matteo Pagliazzi 9b19bd5076 chore(i18n): update locales 2015-04-11 14:53:33 +02:00
Matteo Pagliazzi 61db64e963 chore(i18n): update locales 2015-04-03 13:28:45 +02:00
Matteo Pagliazzi f243617ccf chore(i18n): update locales 2015-03-18 20:01:29 +01: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