Merge pull request #1921 from pixelfed/staging

Update Timeline.vue, restore notification card

public/mix-manifest.json

@@ -25,5 +25,5 @@
     "/js/status.js": "/js/status.js?id=e79505d19162a11cb404",
     "/js/story-compose.js": "/js/story-compose.js?id=7b00ed457af2459b916e",
     "/js/theme-monokai.js": "/js/theme-monokai.js?id=39b089458f249e8717ad",
-    "/js/timeline.js": "/js/timeline.js?id=db3cecdcc13e2d990143"
+    "/js/timeline.js": "/js/timeline.js?id=bad396bbfbe5fd2ad3e8"
 }

resources/assets/js/components/Timeline.vue

@@ -255,9 +255,9 @@
 					<announcements-card v-on:show-tips="showTips = $event"></announcements-card>
 				</div>
 
-				<!-- <div v-show="modes.notify == true && !loading" class="mb-4">
+				<div v-show="modes.notify == true && !loading" class="mb-4">
 					<notification-card></notification-card>
-				</div> -->
+				</div>
 
 				<div v-show="showSuggestions == true && suggestions.length && config.ab && config.ab.rec == true" class="mb-4">
 					<div class="card">