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

..

api-v3

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

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

api-v4

Add Test to opt out of username being searchable

2018-11-27 13:20:26 +01:00

top-level

Allow gems and subs to be gifted through in-app-purchases (#10892)

2018-12-23 19:20:14 +01:00