Merge branch 'develop' into phoenix1.7
This commit is contained in:
commit
a0e08c6ec2
251 changed files with 6494 additions and 1976 deletions
7
mix.exs
7
mix.exs
|
|
@ -4,8 +4,8 @@ defmodule Pleroma.Mixfile do
|
|||
def project do
|
||||
[
|
||||
app: :pleroma,
|
||||
version: version("2.5.52"),
|
||||
elixir: "~> 1.12",
|
||||
version: version("2.6.50"),
|
||||
elixir: "~> 1.11",
|
||||
elixirc_paths: elixirc_paths(Mix.env()),
|
||||
compilers: Mix.compilers(),
|
||||
elixirc_options: [warnings_as_errors: warnings_as_errors()],
|
||||
|
|
@ -152,7 +152,8 @@ defmodule Pleroma.Mixfile do
|
|||
{:bbcode_pleroma, "~> 0.2.0"},
|
||||
{:cors_plug, "~> 2.0"},
|
||||
{:web_push_encryption, "~> 0.3.1"},
|
||||
{:swoosh, "~> 1.0"},
|
||||
# swoosh 1.11.2+ requires Elixir 1.12+
|
||||
{:swoosh, "~> 1.10.0"},
|
||||
{:phoenix_swoosh, "~> 1.1"},
|
||||
{:gen_smtp, "~> 0.13"},
|
||||
{:ex_syslogger, "~> 1.4"},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue