From: kaniini <nenolod@gmail.com>
Date: Tue, 16 Apr 2019 18:35:58 +0000 (+0000)
Subject: Merge branch 'patch-2' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=6ddaeb14e20f3a398234b4b390feefd298fe61b9;p=akkoma

Merge branch 'patch-2' into 'develop'

Add supervisord configuration

See merge request pleroma/pleroma!1066
---

6ddaeb14e20f3a398234b4b390feefd298fe61b9