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

Browse Source

Conflicts:
- `app/services/process_mentions_service.rb`:
  glitch-soc local-only handling, ported upstream changes

...

This commit is contained in:

Thibaut Girka

2020-10-26 15:47:21 +01:00

parent 36e5c9d45b 3678b10823

commit 9c34090db8

8 changed files with 534 additions and 544 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

1010

yarn.lock

File diff suppressed because it is too large Load Diff