From: kaniini <ariadne@dereferenced.org>
Date: Tue, 23 Jul 2019 19:14:16 +0000 (+0000)
Subject: Merge branch 'patch-2' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=ad608373005036a1181474ec446ed9d882385248;p=akkoma

Merge branch 'patch-2' into 'develop'

Update `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`.

Closes #1050

See merge request pleroma/pleroma!1475
---

ad608373005036a1181474ec446ed9d882385248