]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sun, 23 Dec 2018 10:28:28 +0000 (11:28 +0100)
committerThibaut Girka <thib@sitedethib.com>
Sun, 23 Dec 2018 10:28:28 +0000 (11:28 +0100)
commit3e686beaea1931c76c778d8ca6b03c41caaf69db
treef659a52ba0245daf2c7776e63c3a5012f906552a
parent1a3088364fe602bb48647d78dda440b174424e17
parente25947db4a44cd50fa1daa36d5031a950327b646
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.
22 files changed:
app/controllers/directories_controller.rb
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/models/account.rb
app/models/concerns/account_associations.rb
app/views/admin/reports/show.html.haml
config/locales/ca.yml
config/locales/de.yml
config/locales/en.yml
config/locales/es.yml
config/locales/gl.yml
config/locales/ja.yml
config/locales/nl.yml
config/locales/oc.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/locales/simple_form.en.yml
config/locales/sk.yml
config/routes.rb
db/schema.rb