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

# Conflicts:
#	website/client/components/chat/chatCard.vue
#	website/client/components/chat/chatMessages.vue
#	website/common/locales/en/messages.json
#	website/server/libs/slack.js

2018-09-22 19:18:08 +02:00

..

unit

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

2018-09-22 19:18:08 +02:00

v3/integration

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

2018-09-22 19:18:08 +02:00

v4

Move inbox to its own model (#10428)

2018-09-21 15:12:20 +02:00