Commit graph

12 commits

Author SHA1 Message Date
Matteo Pagliazzi
afc6fba5bf chore(i18n): update locales 2015-06-22 18:24:37 +02:00
Matteo Pagliazzi
4ee3e711d1 chore(i18n): update locales 2015-06-08 18:57:38 +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
c699fcde49 chore(i18n): update locales 2015-04-22 16:22:11 +02:00
Matteo Pagliazzi
662c8cd529 chore(i18n): update locales 2015-04-19 13:28:21 +02:00
Matteo Pagliazzi
820909dd9b chore(i18n): update locales 2015-04-08 19:15:03 +02:00
Matteo Pagliazzi
2937c13f6b chore(i18n): update locales 2015-03-29 22:30:53 +02:00
Matteo Pagliazzi
b0b6864f1c chore(i18n): update locales 2015-03-16 19:56:35 +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
c91b0cd34a Moved folders into common directory 2015-01-21 10:34:04 -06:00
Renamed from locales/ru/backgrounds.json (Browse further)