diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-05-03 17:23:44 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-05-03 17:23:44 -0500 |
| commit | c816701550d7cdb593371dc47d0b9430c78308b0 (patch) | |
| tree | cc4417d14de20e69fd5f9a58d66f84af4a623329 /config/settings.yml | |
| parent | 3a47842223ff93d8c057f804809f1b111dfd6f76 (diff) | |
| parent | a7e71bbd08e089938fbf20ddef5768c2f3ee0702 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml
Diffstat (limited to 'config/settings.yml')
| -rw-r--r-- | config/settings.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/settings.yml b/config/settings.yml index 580a20895..a92a0bfd0 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -49,6 +49,7 @@ defaults: &defaults - root - webmaster - administrator + disallowed_hashtags: # space separated string or list of hashtags without the hash bootstrap_timeline_accounts: '' activity_api_enabled: true peers_api_enabled: true |