From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Tue, 8 Sep 2020 16:42:27 +0000 (+0000)
Subject: Merge branch 'bugfix/mock' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=073f5490ece616fd9602382c1be1347457cbbe79;hp=073f5490ece616fd9602382c1be1347457cbbe79;p=akkoma

Merge branch 'bugfix/mock' into 'develop'

mockfix but for non-secteam because gitlab

See merge request pleroma/pleroma!2973
---