negue 31ef21f25c Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm ...

# Conflicts:
#	website/client/store/actions/chat.js

2018-06-25 18:47:47 +02:00

..

actions

Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm

2018-06-25 18:47:47 +02:00

getters

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

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

index.js

Group plan landing page (#10222)

2018-04-03 11:26:08 -05:00