Merge branch 'patch-2' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 16 Apr 2019 18:35:58 +0000 (18:35 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 16 Apr 2019 18:35:58 +0000 (18:35 +0000)
commit6ddaeb14e20f3a398234b4b390feefd298fe61b9
treed882a9e02e6255c50aa33c7c8b4f4e3ef45b8096
parent5f31e7ec6b6c0d5e6e4a5ee9397c0d3954329982
parent498c96d458e383a9e8b647a6f10bdbebac116579
Merge branch 'patch-2' into 'develop'

Add supervisord configuration

See merge request pleroma/pleroma!1066