Merge branch 'patch-2' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Tue, 23 Jul 2019 19:14:16 +0000 (19:14 +0000)
committerkaniini <ariadne@dereferenced.org>
Tue, 23 Jul 2019 19:14:16 +0000 (19:14 +0000)
commitad608373005036a1181474ec446ed9d882385248
treef9986ae0c8e9e5b4d3907805cf6fdba681d415b7
parent03d89e182e0323f775232a4ddab66615f39dc765
parent2e697f87f45f2982b53c4a0ec73f14526b6f8cf4
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