From: rinpatch <rinpatch@sdf.org>
Date: Sat, 29 Jun 2019 11:24:14 +0000 (+0000)
Subject: Merge branch 'my-develop' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=9b1e75bac8f6e042e7f70e4f29cc60fa96000323;p=akkoma

Merge branch 'my-develop' into 'develop'

Docker specific configuration information

See merge request pleroma/pleroma!1359
---

9b1e75bac8f6e042e7f70e4f29cc60fa96000323