Merge branch 'chore/maint-1.1-1.1.0-rc1' into 'maint/1.1'

Pleroma 1.0.90 (aka 1.1 RC1).

See merge request pleroma/pleroma!1754

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fb7184f5dc51f66066d1dc1ee2e81bb7e990150..cd5b55c46a4846e62727147b69006e43f03c1332 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]
+## [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 dd891a948a1751a0feeaa436419b1b8277c8e793..706d97b8e144ed2acfcb1d24b5ebcafe793d7eb7 100644 (file)
--- 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(),