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

Browse Source

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.

...

This commit is contained in:

Thibaut Girka

2020-08-30 16:13:08 +02:00

parent 30632adf9e 52157fdcba

commit 8c3c27bf06

109 changed files with 2948 additions and 1238 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1215

yarn.lock

File diff suppressed because it is too large Load Diff