negue c862bdb76a Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/modal-notifications ...

# Conflicts:
#	website/client/components/notifications.vue

2018-08-18 14:25:20 +02:00

..

client

Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/modal-notifications

2018-08-18 14:25:20 +02:00

common

Merge branch 'release' into develop

2018-08-18 03:32:39 +00:00

raw_sprites

Handleless wheelchair options (#10572)

2018-08-17 12:23:43 +02:00

server

combine cron's Resting in the Inn code with non-sleeping code - fixes #5232 etc (#10577)

2018-08-18 12:47:07 +02:00

static

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

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