Merge branch 'dockerfix' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Tue, 21 Sep 2021 22:04:59 +0000 (22:04 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Tue, 21 Sep 2021 22:04:59 +0000 (22:04 +0000)
commitd86b10a5e33d9045c93d0b94cb5aca18f5790d63
tree9548dfe6cbe36d8391fa4fdef2a3b8d9a088621d
parent6b3842cf50c063a63980c8d4dca93b25424059f2
parent36df37e05638749317a80071b9ed231a22224c0c
Merge branch 'dockerfix' into 'develop'

Docker fix

See merge request pleroma/pleroma!3526