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

1 files changed, 1 insertions, 1 deletions

diff --git a/mix.exs b/mix.exs
index 11fdb1670..d7c408972 100644
--- a/mix.exs
+++ b/mix.exs
@@ -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(),