Commit Graph

19 Commits

Author SHA1 Message Date
Blade Barringer 92a8c3d958 chore(i18n): update locales 2015-11-11 20:24:12 -06:00
Blade Barringer b82054128d chore(i18n): update locales 2015-10-27 21:36:51 -05:00
Blade Barringer 60cc428b81 chore(i18n): update locales 2015-10-08 17:42:10 -05:00
Blade Barringer 7bfa18fd05 chore(i18n): update locales 2015-09-06 13:33:29 -05:00
Blade Barringer cbea9f4200 chore(i18n): update locales 2015-08-29 07:38:54 -05:00
Blade Barringer 01e2c30795 chore(i18n): update locales 2015-08-11 07:38:42 -05:00
Matteo Pagliazzi 0a340de9c8 chore(i18n): update locales 2015-08-11 14:32:00 +02:00
Blade Barringer 25fc92d59e chore(i18n): update locales 2015-07-30 22:49:22 -05:00
Blade Barringer d8434a5512 chore(i18n): update locales 2015-07-22 21:24:10 -05:00
Matteo Pagliazzi 3fa8ab80b5 chore(i18n): update locales 2015-07-17 15:31:12 +02:00
Matteo Pagliazzi 38ac664284 chore(i18n): update locales 2015-07-15 13:17:57 +02:00
Matteo Pagliazzi 782ae4f81c chore(i18n): update locales 2015-06-23 10:43:29 +02:00
Matteo Pagliazzi d3353aa751 chore(i18n): update locales 2015-06-15 13:20:09 +02:00
Matteo Pagliazzi 995721e0da chore(i18n): update locales 2015-05-31 15:36:54 +02:00
Matteo Pagliazzi 047ce0141f chore(i18n): update locales 2015-05-24 11:27:17 +02:00
Matteo Pagliazzi e474f0300c chore(i18n): update locales 2015-04-15 17:13:07 +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