Merge branch 'features/docker-updates' into 'develop'
authorlain <lain@soykaf.club>
Tue, 14 Jan 2020 17:48:58 +0000 (17:48 +0000)
committerlain <lain@soykaf.club>
Tue, 14 Jan 2020 17:48:58 +0000 (17:48 +0000)
commitb4532277b1448b9108585bfdc2fc61918fc4fb6c
tree280a0a0f50a9291f08da693b0e2df7e942e8bc85
parentd150c598d7e9bb9d5a72bea04c65c1206f55f3bd
parent964d188a96f8d746b6d1c0ca06c9abc5bc682a11
Merge branch 'features/docker-updates' into 'develop'

Features/docker updates

See merge request pleroma/pleroma!2104