projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index 1a7aac6a486e3d0504fedbbde2321c62c8f8c2d5..4ec76a50f94476f36794f4b893191ca881909fcc 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-4,7
+4,7
@@
defmodule Pleroma.Mixfile do
def project do
[
app: :pleroma,
def project do
[
app: :pleroma,
- version: version("2.
3.50
"),
+ version: version("2.
4.51
"),
elixir: "~> 1.9",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
elixir: "~> 1.9",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
@@
-138,15
+138,15
@@
defmodule Pleroma.Mixfile do
{:cowlib, "~> 2.9", override: true},
{:gun, "~> 2.0.0-rc.1", override: true},
{:jason, "~> 1.2"},
{:cowlib, "~> 2.9", override: true},
{:gun, "~> 2.0.0-rc.1", override: true},
{:jason, "~> 1.2"},
- {:mogrify, "~> 0.
7.4
"},
+ {:mogrify, "~> 0.
9.1
"},
{:ex_aws, "~> 2.1.6"},
{:ex_aws_s3, "~> 2.0"},
{:sweet_xml, "~> 0.6.6"},
{:ex_aws, "~> 2.1.6"},
{:ex_aws_s3, "~> 2.0"},
{:sweet_xml, "~> 0.6.6"},
- {:earmark, "1.4.15"},
+ {:earmark, "
~>
1.4.15"},
{:bbcode_pleroma, "~> 0.2.0"},
{:crypt,
{:bbcode_pleroma, "~> 0.2.0"},
{:crypt,
- git: "https://git
.pleroma.social/pleroma/elixir-librarie
s/crypt.git",
- ref: "
cf2aa3f11632e8b0634810a15b3e612c7526f6a3
"},
+ git: "https://git
hub.com/msanto
s/crypt.git",
+ ref: "
f75cd55325e33cbea198fb41fe41871392f8fb76
"},
{:cors_plug, "~> 2.0"},
{:web_push_encryption,
git: "https://github.com/lanodan/elixir-web-push-encryption.git", branch: "bugfix/otp-24"},
{:cors_plug, "~> 2.0"},
{:web_push_encryption,
git: "https://github.com/lanodan/elixir-web-push-encryption.git", branch: "bugfix/otp-24"},
@@
-158,7
+158,7
@@
defmodule Pleroma.Mixfile do
{:timex, "~> 3.6"},
{:ueberauth, "~> 0.4"},
{:linkify, "~> 0.5.1"},
{:timex, "~> 3.6"},
{:ueberauth, "~> 0.4"},
{:linkify, "~> 0.5.1"},
- {:http_signatures, "~> 0.1.
0
"},
+ {:http_signatures, "~> 0.1.
1
"},
{:telemetry, "~> 0.3"},
{:poolboy, "~> 1.5"},
{:prometheus, "~> 4.6"},
{:telemetry, "~> 0.3"},
{:poolboy, "~> 1.5"},
{:prometheus, "~> 4.6"},