Merge branch 'bugfix/status-search-fallback' into 'develop'
authorrinpatch <rin@patch.cx>
Fri, 13 Aug 2021 12:09:39 +0000 (12:09 +0000)
committerrinpatch <rin@patch.cx>
Fri, 13 Aug 2021 12:09:39 +0000 (12:09 +0000)
Activity.Search: resolve status on DB Timeout

Closes #2566

See merge request pleroma/pleroma!3507

1  2 
CHANGELOG.md

diff --cc CHANGELOG.md
Simple merge