sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-01 03:30:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
habitica-self-host/common/locales/fr
History
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
..
_README_FIRST.md Moved folders into common directory 2015-01-21 10:34:04 -06:00
backgrounds.json Moved folders into common directory 2015-01-21 10:34:04 -06:00
challenge.json Moved folders into common directory 2015-01-21 10:34:04 -06:00
character.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-03 19:26:14 -06:00
communityguidelines.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-03 19:26:14 -06:00
content.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-03 19:26:14 -06:00
contrib.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-01 14:07:18 -06:00
defaulttasks.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-03 19:26:14 -06:00
front.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-03 19:26:14 -06:00
gear.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-03 19:26:14 -06:00
generic.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-03 19:26:14 -06:00
groups.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-01 14:07:18 -06:00
limited.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-01 14:07:18 -06:00
messages.json Moved folders into common directory 2015-01-21 10:34:04 -06:00
npc.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-03 19:26:14 -06:00
pets.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-01 14:07:18 -06:00
quests.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-03 19:26:14 -06:00
questscontent.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-03 19:26:14 -06:00
rebirth.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-03 19:26:14 -06:00
settings.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-03 19:26:14 -06:00
spells.json Moved folders into common directory 2015-01-21 10:34:04 -06:00
subscriber.json Moved folders into common directory 2015-01-21 10:34:04 -06:00
tasks.json Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert 2015-02-03 19:26:14 -06:00