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

..

creator

New client creator (#8841)

2017-07-04 13:11:08 -05:00

css

chore(news): Bailey

2019-02-04 16:52:17 -06:00

images

chore(news): Bailey

2019-02-04 16:52:17 -06:00

members

New client members (#8795)

2017-06-08 14:27:22 -07:00

scss

Move tier icons import to index

2019-02-05 14:39:48 +01:00

svg

drag tags to reorder (#10911)

2018-12-23 19:45:05 +01:00