diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-26 16:02:54 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-26 16:02:54 +0100 |
commit | b9f314bba754074c7ac7dad37cdd35a0cbf1d1b5 (patch) | |
tree | 987f8ceff468686d7f4185cf2312e56aed45ecd1 /config/locales/en.yml | |
parent | 648cf8bfd51913929b7d0d3a637de496d6e40f89 (diff) | |
parent | 0c1a05b281c2665b52a644d51b9b06c2756479a7 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml
Diffstat (limited to 'config/locales/en.yml')
-rw-r--r-- | config/locales/en.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index f88706434..2e6095e5e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -245,6 +245,7 @@ en: feature_profile_directory: Profile directory feature_registrations: Registrations feature_relay: Federation relay + feature_timeline_preview: Timeline preview features: Features hidden_service: Federation with hidden services open_reports: open reports |