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

2022-02-12 11:12:41 +01:00
parent 28ec7def58 79b167f01a
commit d9379f5331
18 changed files with 112 additions and 13 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1148,6 +1148,8 @@ en:
      title: New boost
    status:
      subject: "%{name} just posted"
+    update:
+      subject: "%{name} edited a post"
  notifications:
    email_events: Events for e-mail notifications
    email_events_hint: 'Select events that you want to receive notifications for:'