Merge branch 'features/docker-updates' into 'develop'
authorfeld <feld@feld.me>
Tue, 14 Jan 2020 21:36:52 +0000 (21:36 +0000)
committerfeld <feld@feld.me>
Tue, 14 Jan 2020 21:36:52 +0000 (21:36 +0000)
commit77412d5dd24a384f9be7d6bc6b1538415c584802
tree2218dae596caff4eaddab451402743f352697646
parentb4532277b1448b9108585bfdc2fc61918fc4fb6c
parenta58a0a7b1b85f900c52c63fc9a4c55a84431d0b0
Merge branch 'features/docker-updates' into 'develop'

Features/docker updates

See merge request pleroma/pleroma!2105