diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-11 15:43:09 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-11 15:43:09 +0100 |
| commit | e6408b2e7ade3dac8dcf14bcda5b5c6a159fa74c (patch) | |
| tree | 7ba827f801bea1556231d275a6a8a35471f8a954 /config/settings.yml | |
| parent | 0afed995ce60dec11bc7718f83ca5afde86f6228 (diff) | |
| parent | 446aad4ce2cb7afd0ba8e4b508e4dcba57eac790 (diff) | |
Merge branch 'feature-privacy-federation' into development
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 a78bd067d..71ce12e63 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -1,5 +1,6 @@ # config/app.yml for rails-settings-cached defaults: &defaults + site_title: 'Mastodon' site_description: '' site_extended_description: '' site_contact_username: '' |