Merge branch 'cherry-pick-a65fc78c' into 'stable'
authorfeld <feld@feld.me>
Sat, 21 Nov 2020 18:29:26 +0000 (18:29 +0000)
committerfeld <feld@feld.me>
Sat, 21 Nov 2020 18:29:26 +0000 (18:29 +0000)
commit15550f7c4bf75401d0f18add0f847f640acc6627
tree0594b692b63aac7c99b59769e1d448bf336ce503
parent9fc3356a06158c21c7e113552de4bcf2a6426df7
parent9b7ade65685002d5a50ddec4d0c6d2c4dc29c208
Merge branch 'cherry-pick-a65fc78c' into 'stable'

Dockerfile fixes for stable

See merge request pleroma/pleroma!3169