Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications

2019-04-02 10:07:36 -04:00 · 2019-04-02 10:07:36 -04:00 · 8b3f037f87
commit 8b3f037f87
parent 6482201dc9 ac28e8c2f9
47 changed files with 813 additions and 150 deletions
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@ -7,6 +7,9 @@ import {
 } from '../../services/notification_utils/notification_utils.js'

 const Notifications = {
+  props: [
+    'noHeading'
+  ],
  created () {
    const store = this.$store
    const credentials = store.state.users.currentUser.credentials