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

2018-10-08 13:51:33 +02:00
parent 96c3d26870 4c4ff05a46
commit d17844e6d1
58 changed files with 875 additions and 106 deletions
--- 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