tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Thibaut Girka committed 2018-10-08 13:51:33 +02:00
2 parents 96c3d26870 4c4ff05a46
commit d17844e6d1
58 files changed
+875 -106
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/controllers/admin/settings_controller.rb
+2
View File
@@ -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