hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into gun

Browse source
This commit is contained in:
Alexander Strizhakov 2020-03-01 12:48:49 +03:00
commit d9e4b77f8b
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
1298 changed files with 3836 additions and 1862 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mix.exs
View file

@ -117,7 +117,7 @@ defmodule Pleroma.Mixfile do
{:html_entities, "~> 0.5", override: true},
{:phoenix_html, "~> 2.10"},
{:calendar, "~> 0.17.4"},
{:cachex, "~> 3.0.2"},
{:cachex, "~> 3.2"},
{:poison, "~> 3.0", override: true},
# {:tesla, "~> 1.3", override: true},
{:tesla,