Changelog, mix: merge in stable

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a55ebbf8a067fa2a62d152bf30e63120d9ab1548..40c423273a04828853fee962971d7e4886f67eaa 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## Unreleased
+
+## Unreleased (Patch)
+
 ## [2.3.0] - 2020-03-01
 
 ### Security

diff --git a/mix.exs b/mix.exs
index 436381f325b766778856e42284d571f350cd836e..ec6e92df74221355046da968e35bf568e45e3119 100644 (file)
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
   def project do
     [
       app: :pleroma,
-      version: version("2.3.0"),
+      version: version("2.3.50"),
       elixir: "~> 1.9",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),