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

..

notifications

removing the 24px top margin on .modal-dialog .title (#10377)

2018-06-15 10:58:28 +02:00

index.vue

Open correct group modal from header (#10430)

2018-06-15 11:00:10 +02:00

menu.vue

move reportFlagModal to menu.vue

2018-06-08 19:15:21 +02:00

messageCount.vue

Notifications v2 and Bailey API (#9716)

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

notificationsDropdown.vue

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

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

userDropdown.vue

Client: use api v4 (#10457)

2018-06-21 21:25:27 +02:00