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
This commit is contained in:
		
						commit
						70d18a278c
					
				
					 2 changed files with 2 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -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.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										2
									
								
								mix.exs
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								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(),
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue