diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-11-26 23:41:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-26 23:41:01 +0100 |
| commit | 4aec8087c71a623abdf201bbc2619507a6b02374 (patch) | |
| tree | 931f4c972e55ec032f3f5f6b58621d0380a92a5e /app/models/form/admin_settings.rb | |
| parent | 97151840b02499a0cec1360907a6b86a1df02b3b (diff) | |
| parent | ca5d78816bb31454de28480dec5c6384ed259eef (diff) | |
Merge pull request #1640 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/form/admin_settings.rb')
| -rw-r--r-- | app/models/form/admin_settings.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index 0276ec058..3202d1fc2 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -27,7 +27,6 @@ class Form::AdminSettings custom_css profile_directory hide_followers_count - enable_keybase flavour_and_skin thumbnail hero @@ -53,7 +52,6 @@ class Form::AdminSettings preview_sensitive_media profile_directory hide_followers_count - enable_keybase show_reblogs_in_public_timelines show_replies_in_public_timelines trends |