diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2020-12-23 01:47:45 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-23 01:47:45 +0100 |
| commit | 537afa00f35dbaa98cbff284683317b411104a82 (patch) | |
| tree | d71a57d5f5b6bd864ec11cc1c914a6c3b30ba612 /public/emoji/1f961.svg | |
| parent | 81f4c550b2ed305f39f344d10289b38625f70bf7 (diff) | |
| parent | 444b21b55ff5768e4cbbaf7cfa8285c65a4b54f9 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/lib/feed_manager.rb`: Not a real conflict, glitch-soc-only DM-related method too close to changed upstream stuff. Ported upstream changes. - `app/services/batched_remove_status_service.rb`: Additional logic in glitch-soc to clear DMs from timelines. Ported upstream changes and fixed the DM TL clearing logic. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Additional code in glitch-soc to clear DM timelines. Ported upstream changes.
Diffstat (limited to 'public/emoji/1f961.svg')
0 files changed, 0 insertions, 0 deletions