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

Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0

Browse source
This commit is contained in:
lain 2020-08-25 15:16:20 +02:00
commit ea2b5c07e3
191 changed files with 220 additions and 466 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mix.exs
View file

@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
def project do
[
app: :pleroma,
version: version("2.0.50"),
version: version("2.1.0"),
elixir: "~> 1.9",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),