diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-11-27 11:29:04 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-11-27 11:29:04 -0600 |
| commit | e77c3996a513a45e5cad368b0053459f303c60cb (patch) | |
| tree | 923411336e4207bb95c17c90c79f19dabb4d62e2 /app/controllers/admin/settings_controller.rb | |
| parent | 5de42665d77431def632ca8fb8665082027c60a5 (diff) | |
| parent | 1c5b0e333464d8da3de73e4886502c816cb8173e (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'app/controllers/admin/settings_controller.rb')
| -rw-r--r-- | app/controllers/admin/settings_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index d9199b3d5..eed5fb6b5 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -16,6 +16,7 @@ module Admin show_staff_badge bootstrap_timeline_accounts thumbnail + min_invite_role ).freeze BOOLEAN_SETTINGS = %w( |