Merge branch 'my-develop' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Sat, 29 Jun 2019 11:24:14 +0000 (11:24 +0000)
committerrinpatch <rinpatch@sdf.org>
Sat, 29 Jun 2019 11:24:14 +0000 (11:24 +0000)
Docker specific configuration information

See merge request pleroma/pleroma!1359


Trivial merge