summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-03-05 22:35:23 +0300
committerrinpatch <rinpatch@sdf.org>2020-03-05 22:35:23 +0300
commit3508ae70393a2e388b4d639e957356d19d16721f (patch)
treebac7f88477ffa064d8f59ba0e4c534c77ad0b750
parent69a85e9c825e38417ce35ad9b79e6f8cf21d80bd (diff)
version bump changelog and mix version
-rw-r--r--CHANGELOG.md2
-rw-r--r--mix.exs2
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c6616b90..59f7dfcdd 100644
--- 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 266dcac27..89b56bc5d 100644
--- 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(),