diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-02-02 08:39:52 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-02-02 08:39:52 -0600 |
| commit | 4c1fd9a19c779fa6e7d74513c61f37ce05a841b3 (patch) | |
| tree | 0cf23810e2f7ff0f45c65a3f2f9b35016587c68a /app/views/settings/preferences/show.html.haml | |
| parent | ad3a2dfb66abc01a90807f23191b7e28c3c242ed (diff) | |
| parent | 33f56811e38bc330de9dcfa6794c29a176a30311 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Conflicts:
app/javascript/styles/mastodon/components.scss
Diffstat (limited to 'app/views/settings/preferences/show.html.haml')
| -rw-r--r-- | app/views/settings/preferences/show.html.haml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index d1459d93c..a2a17d0d6 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -4,6 +4,9 @@ = simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f| = render 'shared/error_messages', object: current_user + .actions + = f.button :button, t('generic.save_changes'), type: :submit + %h4= t 'preferences.languages' .fields-group |