Phillip Thelen a629ec510f Fix merge issue

2019-09-19 16:22:28 +02:00

..

client

Fix merge issue

2019-09-19 16:22:28 +02:00

common

Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username

2019-09-19 16:08:13 +02:00

raw_sprites

feat(content): new pet color achievements

2019-09-17 16:10:32 -05:00

server

Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username

2019-09-19 16:08:13 +02:00

static

fix(audio): rename todo audio files with wrong casing, fixes #10294

2018-05-19 20:03:19 +02:00