Merge upstream (#111)

2017-08-01 13:07:43 -07:00
parent b61e3daf98 7ef8482568
commit 8150689b48
205 changed files with 1927 additions and 1507 deletions
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -17,9 +17,11 @@ defaults: &defaults
  closed_registrations_message: ''
  open_deletion: true
  timeline_preview: false
+  default_sensitive: false
+  unfollow_modal: false
  boost_modal: false
-  auto_play_gif: false
  delete_modal: true
+  auto_play_gif: false
  system_font_ui: false
  noindex: false
  notification_emails: