Merge branch 'revert-5c6c3026' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Thu, 21 Nov 2019 15:20:05 +0000 (15:20 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 21 Nov 2019 15:20:05 +0000 (15:20 +0000)
Revert "Merge branch 'patch-1' into 'develop'"

See merge request pleroma/pleroma!2002


Trivial merge