]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Mon, 10 Jun 2019 16:30:41 +0000 (18:30 +0200)
committerThibaut Girka <thib@sitedethib.com>
Mon, 10 Jun 2019 16:59:53 +0000 (18:59 +0200)
commit1b0ff4cd69b00f0d2613be45cc233e25dc1a0d05
tree1b67879adb426809f3e00102fc2f97a8118b011e
parentb45f555a0c7a7d50ed7640b938eb8b5a671a0e10
parent8514ef723c3e3963567a9d57bd0d71a5091fc802
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
27 files changed:
app/controllers/settings/preferences_controller.rb
app/helpers/stream_entries_helper.rb
app/javascript/core/public.js
app/javascript/mastodon/features/compose/components/compose_form.js
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
app/javascript/styles/mastodon/components.scss
app/views/layouts/application.html.haml
app/views/layouts/auth.html.haml
app/views/layouts/mailer.html.haml
app/views/layouts/public.html.haml
app/views/settings/preferences/appearance/show.html.haml
app/views/settings/preferences/other/show.html.haml
app/views/settings/profiles/show.html.haml
app/views/stream_entries/_simple_status.html.haml
config/i18n-tasks.yml
config/locales/en.yml
config/locales/ja.yml
config/locales/pl.yml
config/locales/simple_form.en.yml
config/locales/simple_form.ja.yml
config/locales/simple_form.pl.yml
config/navigation.rb
config/routes.rb
lib/mastodon/version.rb