diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-08 13:51:33 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-08 13:51:33 +0200 |
| commit | d17844e6d1ad700df0f704972e2ce16e8693d33b (patch) | |
| tree | ada49442558fb14c6cf97e79fb6e2dcaa237c7a6 /app/controllers/admin | |
| parent | 96c3d26870d4c8db1978c86b259e85d060d6f271 (diff) | |
| parent | 4c4ff05a461eddafbf38c603b1bf2029be36a0b9 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/settings_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index c05c4c841..46e9b2c07 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -20,6 +20,7 @@ module Admin skin thumbnail hero + mascot min_invite_role activity_api_enabled peers_api_enabled @@ -42,6 +43,7 @@ module Admin UPLOAD_SETTINGS = %w( thumbnail hero + mascot ).freeze def edit |