Merge branch 'gs-master' into glitch-theme

2017-12-04 11:07:01 -06:00
parent 1c74ede69e f2f2f10320
commit d9800a5647
214 changed files with 5378 additions and 1033 deletions
--- a/config/settings.yml
+++ b/config/settings.yml
@ -17,6 +17,8 @@ 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
  boost_modal: false