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

See merge request pleroma/pleroma!2105


Trivial merge