Merge branch 'master' into glitch-soc/merge-upstream

Conflicts: - `package.json`
2019-11-06 14:38:28 +01:00
parent 00793a86bc 42d9ca21de
commit 0ae7d84273
31 changed files with 492 additions and 312 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -11,6 +11,7 @@ en:
    apps: Mobile apps
    apps_platforms: Use Mastodon from iOS, Android and other platforms
    browse_directory: Browse a profile directory and filter by interests
+    browse_local_posts: Browse a live stream of public posts from this server
    browse_public_posts: Browse a live stream of public posts on Mastodon
    contact: Contact
    contact_missing: Not set