From: feld <feld@feld.me>
Date: Wed, 18 Nov 2020 21:16:12 +0000 (+0000)
Subject: Merge branch 'revert-da4660d2' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=8a7ee9fe;hp=42ff5ea95eca6424066e0efbce1d05562414652f;p=akkoma

Merge branch 'revert-da4660d2' into 'develop'

Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"

See merge request pleroma/pleroma!3158
---