Merge pull request #4253 from pixelfed/staging

CHANGELOG.md

composer.lock

config/pixelfed.php

package-lock.json

public/js/about.bundle.44a18841089fdde3.js

public/js/changelog.bundle.7f58a5ccc6659eb2.js

public/js/compose.chunk.c413851da244ae3f.js

public/js/contact.bundle.d6c1d467c11796b1.js

public/js/daci.chunk.afde7c4a5fcab6df.js

public/js/discover.chunk.4f1b3ea93df06670.js

public/js/discover~findfriends.chunk.a740588ad1724793.js

public/js/discover~hashtag.bundle.76807a8ff71bd205.js

public/js/discover~memories.chunk.e7d0bff764b64064.js

public/js/discover~myhashtags.chunk.e788db6a43d0d0a5.js

public/js/discover~serverfeed.chunk.cac5527f5b83302b.js

public/js/discover~settings.chunk.c7fe4bae81961b13.js

public/js/dms.chunk.91ab72a8dcd1a8a8.js

public/js/dms~message.chunk.1cfdf19c4525eafa.js

public/js/error404.bundle.5075813f1b00e10d.js

public/js/help.bundle.7c1195b63e04d568.js