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>
Wed, 18 Nov 2020 21:16:12 +0000 (21:16 +0000)
commit8a7ee9fe74f64680da366b0da51038bed022061b
tree6b89592fbf79f2ad8da74800db6a9d33be765b16
parenta1056aace19d5f6201f06937a93f978917df8418
parent42ff5ea95eca6424066e0efbce1d05562414652f
Merge branch 'revert-da4660d2' into 'develop'

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

See merge request pleroma/pleroma!3158