negue 76860fe3f8 Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/modal-notifications ...

# Conflicts:
#	website/client/components/notifications.vue

2018-07-29 20:21:51 +02:00

..

notification.vue

Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/modal-notifications

2018-07-29 20:21:51 +02:00

notifications.vue

Beard and mustache facial hairs now can be bought as a full set for 5 gems (#10338)

2018-05-13 16:04:43 +02:00