From cfaf794ec639571bdb69c4e1bab5cf96089495d9 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Fri, 9 Sep 2022 02:26:36 +0100
Subject: [PATCH] update changelog, bump version

---
 CHANGELOG.md | 4 +++-
 mix.exs      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f63fa540c..5cd48b07c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,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]
+## 2022.09
 
 ### Added
 - support for fedibird-fe, and non-breaking API parity for it to function
@@ -13,9 +13,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - the ability to obfuscate domains in your MRF descriptions
 - automatic translation of statuses via DeepL or LibreTranslate
 - ability to edit posts
+- ability to react with remote emoji
 
 ### Changed
 - MFM parsing is now done on the backend by a modified version of ilja's parser -> https://akkoma.dev/AkkomaGang/mfm-parser
+- InlineQuotePolicy is now on by default
 
 ### Fixed
 - Compatibility with latest meilisearch
diff --git a/mix.exs b/mix.exs
index ef038ce74..19e6fd045 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
   def project do
     [
       app: :pleroma,
-      version: version("3.1.0"),
+      version: version("3.2.0"),
       elixir: "~> 1.12",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),