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

# Conflicts:
#	package.json

2019-02-05 16:48:06 +01:00

..

libs

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

2019-02-05 16:48:06 +01:00

middlewares

add extra condition to skip ssl check

2019-01-23 17:19:57 +01:00

models

Prevent progress being cleared when quest ends (#10870)

2018-12-28 19:16:21 +01:00