Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif

...ssets/javascripts/components/components/media_gallery.jsx

app/assets/javascripts/components/components/status.jsx

...ts/javascripts/components/containers/status_container.jsx

...scripts/components/features/account/components/header.jsx

...components/features/status/components/detailed_status.jsx

app/assets/javascripts/components/features/status/index.jsx

app/controllers/settings/preferences_controller.rb

app/models/user.rb

app/views/home/initial_state.json.rabl

app/views/settings/preferences/show.html.haml

config/locales/simple_form.en.yml

config/settings.yml