Commit Graph

14 Commits

Author SHA1 Message Date
Matteo Pagliazzi c699fcde49 chore(i18n): update locales 2015-04-22 16:22:11 +02:00
Matteo Pagliazzi e474f0300c chore(i18n): update locales 2015-04-15 17:13:07 +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 820909dd9b chore(i18n): update locales 2015-04-08 19:15:03 +02:00
Matteo Pagliazzi e470764b06 chore(i18n): update locales 2015-04-07 14:03:48 +02:00
Matteo Pagliazzi 6aea352309 chore(i18n): update locales 2015-04-01 18:07:14 +02:00
Matteo Pagliazzi 6e4818cf62 chore(i18n): update locales 2015-03-25 16:53:56 +01:00
Matteo Pagliazzi f243617ccf chore(i18n): update locales 2015-03-18 20:01:29 +01:00
Matteo Pagliazzi 37433ee1aa chore(i18n): update locales 2015-02-18 17:41:31 +01:00
Blade Barringer 6f4fbfeaeb Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
	common/img/sprites/spritesmith/npcs/npc_ian.png
	common/img/sprites/spritesmith/npcs/seasonalshop_winter2015.png
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
2015-02-03 19:26:14 -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 4588be29ee Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-01-23 15:29:56 -06:00
Blade Barringer c91b0cd34a Moved folders into common directory 2015-01-21 10:34:04 -06:00