From: lambda <pleromagit@rogerbraun.net>
Date: Mon, 17 Dec 2018 19:30:05 +0000 (+0000)
Subject: Merge branch 'phoenix14' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=078b8b6d228bee28697fda4bbefe65736f8b0d3c;p=akkoma

Merge branch 'phoenix14' into 'develop'

Upgrade to Phoenix 1.4

Closes #451

See merge request pleroma/pleroma!560
---

078b8b6d228bee28697fda4bbefe65736f8b0d3c