mastodon/app/javascript
Thibaut Girka 37e746eab6 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Upstream change too close to a glitch-soc change related to
  instance-local toots. Merged upstream changes.
- `app/services/fan_out_on_write_service.rb`:
  Minor conflict due to glitch-soc's handling of Direct Messages,
  merged upstream changes.
- `yarn.lock`:
  Not really a conflict, caused by glitch-soc-only dependencies
  being textually too close to updated upstream dependencies.
  Merged upstream changes.
2020-08-30 16:13:08 +02:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2020-07-01 19:23:14 +02:00
flavours Fix replying to some remote toots switching to local-only 2020-08-29 19:57:32 +02:00
fonts
images Merge branch 'master' into glitch-soc/merge-upstream 2020-05-13 22:11:49 +02:00
locales
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2020-08-30 16:13:08 +02:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2020-08-30 16:13:08 +02:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2020-08-30 16:13:08 +02:00