update from upstream

Signed-off-by: Sam Therapy <sam@samtherapy.net>

src/services/notifications_fetcher/notifications_fetcher.service.js

@@ -23,10 +23,13 @@ const fetchAndUpdate = ({ store, credentials, older = false, since }) => {
   const rootState = store.rootState || store.state
   const timelineData = rootState.statuses.notifications
   const hideMutedPosts = getters.mergedConfig.hideMutedPosts
+  const allowFollowingMove = rootState.users.currentUser.allow_following_move
 
   args.includeTypes = mastoApiNotificationTypes
   args.withMuted = !hideMutedPosts
 
+  args.withMove = !allowFollowingMove
+
   args.timeline = 'notifications'
   if (older) {
     if (timelineData.minId !== Number.POSITIVE_INFINITY) {

static/config.json

@@ -25,6 +25,5 @@
   "sidebarRight": false,
   "subjectLineBehavior": "email",
   "theme": "pleroma-dark",
-  "webPushNotifications": false,
-  "showTimelines": false
+  "webPushNotifications": false
 }