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

2019-09-05 11:36:41 +02:00
parent 0128509605 e265b8887d
commit 5088eb8388
55 changed files with 635 additions and 237 deletions
--- a/app/views/directories/index.html.haml
+++ b/app/views/directories/index.html.haml
@@ -49,7 +49,7 @@
            - if account.last_status_at.present?
              %time.time-ago{ datetime: account.last_status_at.iso8601, title: l(account.last_status_at) }= l account.last_status_at
            - else
-              = t('invites.expires_in_prompt')
+              = t('accounts.never_active')

            %small= t('accounts.last_active')