Merge branch 'master' into glitch-soc/merge-upstream

diff --cc app/controllers/directories_controller.rb
Simple merge

diff --cc app/javascript/mastodon/locales/ja.json
Simple merge

diff --cc app/services/post_status_service.rb
Simple merge

diff --cc config/locales/ca.yml
Simple merge

diff --cc config/locales/de.yml
Simple merge

diff --cc config/locales/gl.yml
Simple merge

diff --cc config/locales/ja.yml
Simple merge

diff --cc config/locales/nl.yml
Simple merge

diff --cc config/locales/oc.yml
Simple merge

diff --cc config/locales/pl.yml
Simple merge

diff --cc config/locales/pt-BR.yml
Simple merge

diff --cc config/locales/sk.yml
Simple merge

diff --cc lib/mastodon/version.rb
Simple merge