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)
commitdedb1ad5d68406bf16ac47d5ad7d2c12f97a10b4
tree4178398494d1a3e8f2a5c39ae9d0ae2d2ec94398
parent19b727bf8f54fb29b1a8258640ac59982810a351
parentdc9303eac563d23aebce04ad03e55ab072e548ed
Merge branch 'revert-5c6c3026' into 'develop'

Revert "Merge branch 'patch-1' into 'develop'"

See merge request pleroma/pleroma!2002