]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 22 Jul 2020 11:38:17 +0000 (13:38 +0200)
committerThibaut Girka <thib@sitedethib.com>
Wed, 22 Jul 2020 11:38:17 +0000 (13:38 +0200)
commitb9f351d8455f672137a34ea0ea0b1050fba3464b
tree4a2dd275ddecf46760ccb8140fac5f6cb21ac766
parent801e546ecc1efb4103232d8265229eb455a8dd5b
parent5d9acc0ce41aa0274fef2dd321a8fad1fb0665ea
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/mastodon/actions/compose.js`:
  Not a “real” conflict, but change too close to a change we made to
  fix the vanilla WebUI locally pushing authored local-only toots in the
  public TL view.
app/controllers/api/v1/statuses_controller.rb
app/controllers/application_controller.rb
app/javascript/mastodon/actions/compose.js
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/pl.json
app/lib/feed_manager.rb
app/models/media_attachment.rb
package.json
spec/lib/feed_manager_spec.rb
yarn.lock