negue 8b15d94ae1 Merge remote-tracking branch 'origin/develop' into negue/flagpm ...

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

2018-11-18 22:04:33 +01:00

..

notifications

Username announcement (#10729)

2018-10-02 16:17:06 -05:00

index.vue

feat(usernames): invite by username

2018-11-07 15:00:22 -06:00

menu.vue

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

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

messageCount.vue

Notifications v2 and Bailey API (#9716)

2018-01-31 11:55:39 +01:00

notificationsDropdown.vue

Username announcement (#10729)

2018-10-02 16:17:06 -05:00

userDropdown.vue

fixed new message count alignment (#10541)

2018-07-21 08:08:56 -05:00