Merge pull request #3195 from pixelfed/staging

Staging

app/Http/Controllers/InternalApiController.php

@@ -323,6 +323,9 @@ class InternalApiController extends Controller
 			->simplePaginate(10)
 			->map(function($bookmark) use($pid) {
 				$status = StatusService::get($bookmark->status_id, false);
+				if(!$status) {
+					return false;
+				}
 				$status['bookmarked_at'] = $bookmark->created_at->format('c');
 
 				if($status) {

public/mix-manifest.json

@@ -24,7 +24,7 @@
     "/js/rempos.js": "/js/rempos.js?id=5f24e4ed251a202023f7",
     "/js/rempro.js": "/js/rempro.js?id=2cc0d82e0cef827608c5",
     "/js/search.js": "/js/search.js?id=dc888b173463dc3894ba",
-    "/js/spa.js": "/js/spa.js?id=bdd7e4a94786474132f8",
+    "/js/spa.js": "/js/spa.js?id=d8b884f1a52819e6e082",
     "/js/status.js": "/js/status.js?id=40d0d3dd9884242ce66b",
     "/js/stories.js": "/js/stories.js?id=f882708d5f00b4738dd7",
     "/js/story-compose.js": "/js/story-compose.js?id=0f9d2f7ce5e63ef14c6a",