Merge remote-tracking branch 'tootsuite/master'

2017-11-19 01:30:29 -06:00
parent bcda3f85ce 08deec4c84
commit d083f7741a
38 changed files with 852 additions and 42 deletions
--- a/config/settings.yml
+++ b/config/settings.yml
@ -17,6 +17,7 @@ defaults: &defaults
  closed_registrations_message: ''
  open_deletion: true
  timeline_preview: false
+  show_staff_badge: true
  default_sensitive: false
  unfollow_modal: false
  boost_modal: false