Merge branch 'update/phoenix-and-plug' into 'develop'
authorlain <lain@soykaf.club>
Sat, 15 Jun 2019 15:09:14 +0000 (15:09 +0000)
committerlain <lain@soykaf.club>
Sat, 15 Jun 2019 15:09:14 +0000 (15:09 +0000)
commit37ee6c6e2cfcb6eaffc028cfd87e938bf521d7e8
treedfcd1e584d7c0f357f093ec7457691bde5a447a5
parent52b1b0e45dbc0835cc81530cae0e85cb1264c905
parent9b908697dd542f43c94ebb7bbc7a7b22310bf1ad
Merge branch 'update/phoenix-and-plug' into 'develop'

Update Phoenix

See merge request pleroma/pleroma!1290