Commit Graph

20 Commits

Author SHA1 Message Date
Blade Barringer 38e07246da chore(i18n): update locales 2015-09-13 18:38:59 -05:00
Blade Barringer cbea9f4200 chore(i18n): update locales 2015-08-29 07:38:54 -05:00
Blade Barringer 28046ba3a3 chore(i18n): update locales 2015-08-07 07:38:14 -05:00
Blade Barringer 4bdb2a8b84 chore(i18n): update locales 2015-08-06 08:50:06 -05:00
Blade Barringer 919c072b5d chore(i18n): update locales 2015-08-02 10:30:43 -05:00
Blade Barringer 4598d3d445 chore(i18n): update locales 2015-07-31 09:05:58 -05:00
Blade Barringer 09070a71b5 chore(i18n): update locales 2015-07-31 09:00:26 -05:00
Blade Barringer b565b04a69 chore(i18n): update locales 2015-07-31 08:48:30 -05:00
Blade Barringer a7de79a496 chore(i18n): update locales 2015-07-31 08:28:21 -05:00
Blade Barringer a888a120d9 chore(i18n): update locales 2015-07-30 23:25:04 -05:00
Blade Barringer 25fc92d59e chore(i18n): update locales 2015-07-30 22:49:22 -05:00
Matteo Pagliazzi 6cf0840c71 chore(i18n): update locales 2015-07-14 13:55:03 +02:00
Matteo Pagliazzi d6547682be chore(i18n): update locales 2015-05-17 15:54:18 +02:00
Matteo Pagliazzi b639896ae6 chore(i18n): update locales 2015-05-13 19:47:59 +02:00
Matteo Pagliazzi 8bc5ed83cb chore(i18n): update locales 2015-03-12 16:26:45 +01:00
Matteo Pagliazzi 85b547196e chore(i18n): update locales 2015-02-28 18:23:17 +01:00
Matteo Pagliazzi 34d8a910e3 chore(i18n): update locales 2015-02-14 17:56:11 +01:00
Blade Barringer 9ddb5e35fb Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
	common/dist/scripts/habitrpg-shared.js
	common/dist/sprites/habitrpg-shared.css
	common/img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_10_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_11_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_12_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_13_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_14_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_9_TRUred.png
2015-02-12 13:42:11 -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