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)
commit9b1e75bac8f6e042e7f70e4f29cc60fa96000323
tree036e495b3cbf663d967a063dde8394d952634443
parenta8c9522e04c5d687f8985698de864cccdf3d65e1
parent4c40ada7a5f5067f26135de5fcd97b2d97f90441
Merge branch 'my-develop' into 'develop'

Docker specific configuration information

See merge request pleroma/pleroma!1359