Merge remote-tracking branch 'origin/master' into gs-master

2017-11-27 11:29:04 -06:00
parent 5de42665d7 1c5b0e3334
commit e77c3996a5
29 changed files with 440 additions and 6 deletions
--- a/config/settings.yml
+++ b/config/settings.yml
@ -17,6 +17,7 @@ defaults: &defaults
  closed_registrations_message: ''
  open_deletion: true
  timeline_preview: false
+  min_invite_role: 'admin'
  show_staff_badge: true
  default_sensitive: false
  unfollow_modal: false