Commit 70d18a27 authored by kaniini's avatar kaniini

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
parents 57101955 5bfd4006
......@@ -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.
......
......@@ -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(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment