diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-08-30 16:13:08 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-08-30 16:13:08 +0200 |
| commit | 8c3c27bf063d648823da39a206be3efd285611ad (patch) | |
| tree | c78c0bed2bab5ed64a7dfd546b91b21600947112 /app/services/activitypub/process_collection_service.rb | |
| parent | 30632adf9eda6d83a9b4269f23f11ced5e09cd93 (diff) | |
| parent | 52157fdcba0837c782edbfd240be07cabc551de9 (diff) | |
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.
Diffstat (limited to 'app/services/activitypub/process_collection_service.rb')
0 files changed, 0 insertions, 0 deletions