Merge tootsuite/master at 3023725936

This commit is contained in:
Surinna Curtis
2017-11-16 01:21:16 -06:00
230 changed files with 8548 additions and 567 deletions

View File

@ -7,7 +7,7 @@
# For more information, see docs/Running-Mastodon/Administration-guide.md
#
defaults: &defaults
site_title: Mastodon
site_title: 'dev.glitch.social'
site_description: ''
site_extended_description: ''
site_terms: ''
@ -16,7 +16,7 @@ defaults: &defaults
open_registrations: true
closed_registrations_message: ''
open_deletion: true
timeline_preview: true
timeline_preview: false
default_sensitive: false
unfollow_modal: false
boost_modal: false