Merge tag 'v2.6.0rc1' into instance_only_statuses

2018-10-23 08:32:55 +02:00
parent d42a06fc74 f468bfb830
commit fde9668bae
570 changed files with 11506 additions and 5693 deletions
--- a/config/settings.yml
+++ b/config/settings.yml
@ -27,7 +27,8 @@ defaults: &defaults
  boost_modal: false
  delete_modal: true
  auto_play_gif: false
-  display_sensitive_media: false
+  display_media: 'default'
+  expand_spoilers: false
  preview_sensitive_media: false
  reduce_motion: false
  system_font_ui: false