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

..

achievements.vue

New client more misc (#8902)

2017-07-29 16:08:36 -06:00

inbox.vue

Move tier icons import to index

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

profile.vue

Make profile modal nav tabs better responsive (#10946)

2019-01-26 18:59:17 +01:00

profilePage.vue

Added habitica event for profile display (#9576)

2017-11-27 10:29:20 -06:00

profileStats.vue

Decrease mana when removing stat points from int (#10713)

2018-10-08 22:11:26 +02:00

stats.vue

Fix/mana bar unselected class - fix: #10026 (#10126)

2018-03-24 11:15:40 -05:00