Merge develop
This commit is contained in:
commit
f1f7a11222
82 changed files with 1461 additions and 300 deletions
3
mix.exs
3
mix.exs
|
|
@ -116,7 +116,8 @@ defmodule Pleroma.Mixfile do
|
|||
{:quantum, "~> 2.3"},
|
||||
{:joken, "~> 2.0"},
|
||||
{:benchee, "~> 1.0"},
|
||||
{:esshd, "~> 0.1.0"}
|
||||
{:esshd, "~> 0.1.0"},
|
||||
{:plug_static_index_html, "~> 1.0.0"}
|
||||
] ++ oauth_deps
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue