]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 17 Jun 2020 15:10:15 +0000 (17:10 +0200)
committerThibaut Girka <thib@sitedethib.com>
Wed, 17 Jun 2020 15:10:15 +0000 (17:10 +0200)
commit59e92004b3aa8543a42f1bd40d32f936177a434d
treed952a82dc15cc16bda626d60dd0162c25bb125b4
parent0a5cf075cdddbbe40e79ebad8ee2b1abd62d3200
parentb1d492f30a584a9e204ac1345e6508ed4acb44bd
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `Gemfile.lock`: not a real conflict, upstream update too close
  to a glitch-soc-specific dependency
Gemfile
Gemfile.lock
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
package.json
yarn.lock