From: lain <lain@soykaf.club>
Date: Sat, 15 Jun 2019 15:09:14 +0000 (+0000)
Subject: Merge branch 'update/phoenix-and-plug' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=37ee6c6e2cfcb6eaffc028cfd87e938bf521d7e8;p=akkoma

Merge branch 'update/phoenix-and-plug' into 'develop'

Update Phoenix

See merge request pleroma/pleroma!1290
---

37ee6c6e2cfcb6eaffc028cfd87e938bf521d7e8