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)
Features/docker updates

See merge request pleroma/pleroma!2104


Trivial merge