From 4eb26c9b11444d680b807ae656e464a2d017ed79 Mon Sep 17 00:00:00 2001
From: Element CI <ci@element.io>
Date: Thu, 23 Feb 2023 06:15:44 -0800
Subject: [PATCH] Prepare next release

---
 CHANGES.md                | 12 ++++++++++++
 changelog.d/115.feature   |  1 -
 changelog.d/594.feature   |  1 -
 changelog.d/pr-613.bugfix |  1 -
 project.yml               |  2 +-
 5 files changed, 13 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/115.feature
 delete mode 100644 changelog.d/594.feature
 delete mode 100644 changelog.d/pr-613.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index fed20d066..0afc7ab9c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,15 @@
+## Changes in 1.0.21 (2023-02-23)
+
+✨ Features
+
+- Added a feature that allows a user to report content posted by another user by opening the context menu and provide a reason. ([#115](https://github.com/vector-im/element-x-ios/issues/115))
+- Added support for audio messages in the timeline as previewable files. ([#594](https://github.com/vector-im/element-x-ios/issues/594))
+
+🐛 Bugfixes
+
+- Fix broken split layout room navigation ([#613](https://github.com/vector-im/element-x-ios/pull/613))
+
+
 ## Changes in 1.0.20 (2023-02-22)
 
 ✨ Features
diff --git a/changelog.d/115.feature b/changelog.d/115.feature
deleted file mode 100644
index 9305a6c6b..000000000
--- a/changelog.d/115.feature
+++ /dev/null
@@ -1 +0,0 @@
-Added a feature that allows a user to report content posted by another user by opening the context menu and provide a reason.
\ No newline at end of file
diff --git a/changelog.d/594.feature b/changelog.d/594.feature
deleted file mode 100644
index 9aad93475..000000000
--- a/changelog.d/594.feature
+++ /dev/null
@@ -1 +0,0 @@
-Added support for audio messages in the timeline as previewable files.
\ No newline at end of file
diff --git a/changelog.d/pr-613.bugfix b/changelog.d/pr-613.bugfix
deleted file mode 100644
index a051f9d47..000000000
--- a/changelog.d/pr-613.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix broken split layout room navigation
\ No newline at end of file
diff --git a/project.yml b/project.yml
index 1f637ff6e..2606df459 100644
--- a/project.yml
+++ b/project.yml
@@ -26,7 +26,7 @@ settings:
   APP_GROUP_IDENTIFIER: group.$(BASE_APP_GROUP_IDENTIFIER)
   BASE_BUNDLE_IDENTIFIER: io.element.elementx
   KEYCHAIN_ACCESS_GROUP_IDENTIFIER: $(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)
-  MARKETING_VERSION: 1.0.21
+  MARKETING_VERSION: 1.0.22
   CURRENT_PROJECT_VERSION: 1
   DEVELOPMENT_TEAM: 7J4U792NQT