diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-11 20:43:56 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-11 20:43:56 +0200 |
| commit | 2a7602cad449da3590cb1eac2a86a3e5cc606966 (patch) | |
| tree | e315f30c6cb4b40b670e9cbd15065851d5f44a33 /config | |
| parent | b723ee73fc7d74fd5908eb09a8f6b98e73597c2b (diff) | |
| parent | 06444bf050a267da7001c2801480c5fae3e1559e (diff) | |
Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/simple_form.en.yml | 1 | ||||
| -rw-r--r-- | config/settings.yml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index dfc67fdfd..6b6657a98 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -29,6 +29,7 @@ en: setting_default_privacy: Post privacy type: Import type username: Username + setting_boost_modal: Show confirmation dialog before boosting interactions: must_be_follower: Block notifications from non-followers must_be_following: Block notifications from people you don't follow diff --git a/config/settings.yml b/config/settings.yml index 038a84c55..d364120db 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -14,6 +14,7 @@ defaults: &defaults site_contact_email: '' open_registrations: true closed_registrations_message: '' + boost_modal: true notification_emails: follow: false reblog: false |