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

Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb
2019-06-07 17:00:36 +02:00
parent 8360019896 a60364ca7d
commit 34b8346e7f
63 changed files with 239 additions and 535 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -174,6 +174,7 @@ en:
      statuses: Statuses
      subscribe: Subscribe
      suspended: Suspended
+      time_in_queue: Waiting in queue %{time}
      title: Accounts
      unconfirmed_email: Unconfirmed email
      undo_silenced: Undo silence