summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-09-30 16:40:46 +0000
committerkaniini <ariadne@dereferenced.org>2019-09-30 16:40:46 +0000
commit70d18a278c76e5681543a21150884f9e5dfcd097 (patch)
treeaca3890474b394d2c86cbd191f94c217f260a53f
parent57101955b681b13dfc318d3210a0b59cc377cd8b (diff)
parent5bfd4006ae29e6bf6f076b15bc704aae5f695af1 (diff)
Merge branch 'chore/maint-1.1-1.1.0-rc1' into 'maint/1.1'v1.0.90
Pleroma 1.0.90 (aka 1.1 RC1). See merge request pleroma/pleroma!1754
-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 1fb7184f5..cd5b55c46 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]
+## [1.0.90] - 2019-09-30
### Security
- OStatus: eliminate the possibility of a protocol downgrade attack.
- OStatus: prevent following locked accounts, bypassing the approval process.
diff --git a/mix.exs b/mix.exs
index dd891a948..706d97b8e 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
def project do
[
app: :pleroma,
- version: version("1.0.0"),
+ version: version("1.0.90"),
elixir: "~> 1.7",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),