Merge branch 'develop' into 'fix-move-type-notification'

# Conflicts:
#   static/fontello.json
This commit is contained in:
HJ 2020-01-03 09:05:48 +00:00
commit 215662afde
54 changed files with 1548 additions and 982 deletions

View file

@ -47,6 +47,11 @@ const Notifications = {
components: {
Notification
},
created () {
const { dispatch } = this.$store
dispatch('fetchAndUpdateNotifications')
},
watch: {
unseenCount (count) {
if (count > 0) {