Commit Graph

13 Commits

Author SHA1 Message Date
Matteo Pagliazzi 8dcbf75300 chore(i18n): update locales 2015-04-27 21:05:45 +02:00
Matteo Pagliazzi 662c8cd529 chore(i18n): update locales 2015-04-19 13:28:21 +02:00
Matteo Pagliazzi 6aea352309 chore(i18n): update locales 2015-04-01 18:07:14 +02:00
Matteo Pagliazzi 2937c13f6b chore(i18n): update locales 2015-03-29 22:30:53 +02:00
Matteo Pagliazzi b756e8e462 chore(i18n): update locales 2015-03-21 11:07:13 +01:00
Matteo Pagliazzi 4c3e7f897e chore(i18n): update locales 2015-03-19 20:21:04 +01:00
Matteo Pagliazzi 6d163ecb5d chore(i18n): update locales 2015-03-18 12:13:36 +01:00
Matteo Pagliazzi b0b6864f1c chore(i18n): update locales 2015-03-16 19:56:35 +01:00
Matteo Pagliazzi 14d6a59e96 chore(i18n): update locales 2015-02-23 21:53:50 +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 45d1fb4c6e Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
	common/dist/scripts/habitrpg-shared.js
2015-02-09 22:18:22 -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