diff options
author | Claire <claire.github-309c@sitedethib.com> | 2020-12-23 01:47:45 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-23 01:47:45 +0100 |
commit | 537afa00f35dbaa98cbff284683317b411104a82 (patch) | |
tree | d71a57d5f5b6bd864ec11cc1c914a6c3b30ba612 /config/locales/simple_form.ml.yml | |
parent | 81f4c550b2ed305f39f344d10289b38625f70bf7 (diff) | |
parent | 444b21b55ff5768e4cbbaf7cfa8285c65a4b54f9 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/lib/feed_manager.rb`: Not a real conflict, glitch-soc-only DM-related method too close to changed upstream stuff. Ported upstream changes. - `app/services/batched_remove_status_service.rb`: Additional logic in glitch-soc to clear DMs from timelines. Ported upstream changes and fixed the DM TL clearing logic. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Additional code in glitch-soc to clear DM timelines. Ported upstream changes.
Diffstat (limited to 'config/locales/simple_form.ml.yml')
-rw-r--r-- | config/locales/simple_form.ml.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/simple_form.ml.yml b/config/locales/simple_form.ml.yml index df04a15e8..c60cd9699 100644 --- a/config/locales/simple_form.ml.yml +++ b/config/locales/simple_form.ml.yml @@ -14,3 +14,7 @@ ml: acct: പഴയ അംഗത്വത്തിലേക്കുള്ള പിടി account_migration: acct: പുതിയ അംഗത്വത്തിലേക്കുള്ള പിടി + defaults: + email: ഇ-മെയിൽ വിലാസം + notification_emails: + follow: ആരോ നിങ്ങളെ പിന്തുടർന്നു |