version bump changelog and mix version

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c6616b9032db848ebf4d62e6405d11e9e7ac4ec..59f7dfcddadafe6d756748b72a23444fe4ffd9bc 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@ 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]
+## [2.0.0] - 2019-03-08
 ### Security
 - Mastodon API: Fix being able to request enourmous amount of statuses in timelines leading to DoS. Now limited to 40 per request.
 

diff --git a/mix.exs b/mix.exs
index 266dcac27dc07e87d46ece996c28c43d77c74c9e..89b56bc5d626d4eea9126555b18019a5abf7962e 100644 (file)
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
   def project do
     [
       app: :pleroma,
-      version: version("1.1.50"),
+      version: version("2.0.0"),
       elixir: "~> 1.8",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),