Merge branch 'phoenix14' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Mon, 17 Dec 2018 19:30:05 +0000 (19:30 +0000)
committerlambda <pleromagit@rogerbraun.net>
Mon, 17 Dec 2018 19:30:05 +0000 (19:30 +0000)
commit078b8b6d228bee28697fda4bbefe65736f8b0d3c
tree5ab5ffc319a32beaa954af9f6f216642651c444d
parent567359790ea623949585629c41580961c59a01ff
parentba9ef77b6ae7fd6ade9eb87a418f9c87c7d94647
Merge branch 'phoenix14' into 'develop'

Upgrade to Phoenix 1.4

Closes #451

See merge request pleroma/pleroma!560
test/web/web_finger/web_finger_controller_test.exs