Merge branch 'revert-da4660d2' into 'develop'
authorfeld <feld@feld.me>
Wed, 18 Nov 2020 21:16:12 +0000 (21:16 +0000)
committerfeld <feld@feld.me>
Fri, 20 Nov 2020 21:30:04 +0000 (21:30 +0000)
commitba3bf16c701e8028bc7345b34c0d6d75151cacc6
tree7b37f5886e397a63a204a4b5f35a5faacc926698
parent3e7642b123929593a3f414f63d1708ead11f47b0
Merge branch 'revert-da4660d2' into 'develop'

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

See merge request pleroma/pleroma!3158

(cherry picked from commit 8a7ee9fe74f64680da366b0da51038bed022061b)

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