Merge remote-tracking branch 'upstream/stable' into mergeback/2.5.1
This commit is contained in:
commit
f33401f54b
75 changed files with 147 additions and 75 deletions
2
mix.exs
2
mix.exs
|
|
@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
|
|||
def project do
|
||||
[
|
||||
app: :pleroma,
|
||||
version: version("2.5.50"),
|
||||
version: version("2.5.51"),
|
||||
elixir: "~> 1.11",
|
||||
elixirc_paths: elixirc_paths(Mix.env()),
|
||||
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue