Skip to content
Snippets Groups Projects
Commit 078b8b6d authored by lain's avatar lain
Browse files

Merge branch 'phoenix14' into 'develop'

Upgrade to Phoenix 1.4

Closes #451

See merge request pleroma/pleroma!560
parents 56735979 ba9ef77b
No related branches found
No related tags found
No related merge requests found
Showing
with 500 additions and 211 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment