diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-18 01:25:50 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-18 01:25:50 +0200 |
| commit | 57d784f1e454af5500b608b7a3fd1452ecbb9e6a (patch) | |
| tree | b9c4330970b1d2a62a2d41b90a6d03e2bc303b38 /config | |
| parent | 16d50f60d1f802ee7760ca24883df2ed5a8f4ac0 (diff) | |
| parent | ffb99325cafb5b00ee652c6b3ed2811a4d643fc8 (diff) | |
Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif
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 c25407f2b..5335b0927 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -28,6 +28,7 @@ en: note: Bio otp_attempt: Two-factor code password: Password + setting_auto_play_gif: Auto-play animated GIFs setting_boost_modal: Show confirmation dialog before boosting setting_default_privacy: Post privacy severity: Severity diff --git a/config/settings.yml b/config/settings.yml index 04213fd0b..9813963b2 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -15,6 +15,7 @@ defaults: &defaults open_registrations: true closed_registrations_message: '' boost_modal: false + auto_play_gif: true notification_emails: follow: false reblog: false |