Merge branch '2201-i-hate-this' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Wed, 30 Sep 2020 13:37:46 +0000 (13:37 +0000)
committerrinpatch <rinpatch@sdf.org>
Wed, 30 Sep 2020 13:37:46 +0000 (13:37 +0000)
User search: Once again, change uri handling.

Closes #2201

See merge request pleroma/pleroma!3048


Trivial merge