From 3682d5c5beaa540ede24b413be637b42b4189fee Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Thu, 12 Aug 2021 09:50:18 +0100
Subject: [PATCH 1/7] Remove directRoomBorderView from
 InviteRecentTableViewCell.xib.

---
 .../People/Views/InviteRecentTableViewCell.xib      | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/Riot/Modules/People/Views/InviteRecentTableViewCell.xib b/Riot/Modules/People/Views/InviteRecentTableViewCell.xib
index f1ecf7116..45a40d9e0 100644
--- a/Riot/Modules/People/Views/InviteRecentTableViewCell.xib
+++ b/Riot/Modules/People/Views/InviteRecentTableViewCell.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -25,10 +25,6 @@
                             <constraint firstAttribute="height" constant="42" id="WPC-tL-hnM"/>
                         </constraints>
                     </view>
-                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tDD-Fy-Uvd">
-                        <rect key="frame" x="13" y="15" width="42" height="42"/>
-                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                    </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="RoomTitle" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lg1-xQ-AGn">
                         <rect key="frame" x="69" y="14" width="78" height="21"/>
                         <accessibility key="accessibilityConfiguration" identifier="TitleLabel"/>
@@ -123,17 +119,13 @@
                 </subviews>
                 <constraints>
                     <constraint firstItem="dQt-mN-T6b" firstAttribute="top" secondItem="Lg1-xQ-AGn" secondAttribute="bottom" constant="4" id="1ka-cr-uZP"/>
-                    <constraint firstItem="tDD-Fy-Uvd" firstAttribute="height" secondItem="RX5-eD-c3c" secondAttribute="height" id="3BH-yB-xdI"/>
                     <constraint firstItem="RX5-eD-c3c" firstAttribute="leading" secondItem="aXz-IR-jj5" secondAttribute="leading" constant="13" id="3EJ-qT-J8r"/>
-                    <constraint firstItem="tDD-Fy-Uvd" firstAttribute="width" secondItem="RX5-eD-c3c" secondAttribute="width" id="7Py-HX-vtW"/>
-                    <constraint firstItem="tDD-Fy-Uvd" firstAttribute="centerY" secondItem="RX5-eD-c3c" secondAttribute="centerY" id="FMn-gg-b28"/>
                     <constraint firstItem="Lg1-xQ-AGn" firstAttribute="leading" secondItem="RX5-eD-c3c" secondAttribute="trailing" constant="14" id="Pgp-JM-oQd"/>
                     <constraint firstItem="hVY-f3-80Y" firstAttribute="centerY" secondItem="dQt-mN-T6b" secondAttribute="centerY" id="RM0-3J-ihk"/>
                     <constraint firstItem="gCG-UR-b2u" firstAttribute="top" secondItem="aXz-IR-jj5" secondAttribute="top" constant="14" id="Vb6-hc-Bsk"/>
                     <constraint firstItem="dQt-mN-T6b" firstAttribute="leading" secondItem="RX5-eD-c3c" secondAttribute="trailing" constant="14" id="XFM-LG-4uJ"/>
                     <constraint firstAttribute="trailing" secondItem="gCG-UR-b2u" secondAttribute="trailing" constant="10" id="Zf3-3f-SWg"/>
                     <constraint firstItem="gCG-UR-b2u" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Lg1-xQ-AGn" secondAttribute="trailing" constant="4" id="e2Q-RZ-IF2"/>
-                    <constraint firstItem="tDD-Fy-Uvd" firstAttribute="centerX" secondItem="RX5-eD-c3c" secondAttribute="centerX" id="iJK-au-Cpi"/>
                     <constraint firstAttribute="trailing" secondItem="tjf-WP-vTl" secondAttribute="trailing" constant="54" id="kFW-Fa-ibz"/>
                     <constraint firstItem="hVY-f3-80Y" firstAttribute="leading" secondItem="aXz-IR-jj5" secondAttribute="leading" constant="50" id="prx-bM-qUg"/>
                     <constraint firstAttribute="trailing" secondItem="dQt-mN-T6b" secondAttribute="trailing" id="t2m-pb-5zd"/>
@@ -148,7 +140,6 @@
                 <constraint firstItem="RX5-eD-c3c" firstAttribute="top" secondItem="L2L-l5-wPx" secondAttribute="top" constant="15" id="uLf-cg-Vge"/>
             </constraints>
             <connections>
-                <outlet property="directRoomBorderView" destination="tDD-Fy-Uvd" id="umM-qL-Dkm"/>
                 <outlet property="encryptedRoomIcon" destination="hVY-f3-80Y" id="wyu-Sn-VaV"/>
                 <outlet property="lastEventDescription" destination="dQt-mN-T6b" id="MSz-h1-cAL"/>
                 <outlet property="leftButton" destination="Fc3-Id-aaG" id="cx4-98-B32"/>

From 2049891e8cd0e1d07984a27b31202861f1b2eeb1 Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Thu, 12 Aug 2021 10:03:49 +0100
Subject: [PATCH 2/7] Remove additional directRoomBorderView from
 RecentRoomTableViewCell (share extension).

---
 .../Listing/Views/RecentRoomTableViewCell.m   |  2 --
 .../Listing/Views/RecentRoomTableViewCell.xib | 29 +++++--------------
 2 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m b/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m
index 14a16a68f..386d25835 100644
--- a/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m
+++ b/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m
@@ -23,7 +23,6 @@
 @interface RecentRoomTableViewCell ()
 
 @property (weak, nonatomic) IBOutlet MXKImageView *avatarImageView;
-@property (weak, nonatomic) IBOutlet UIView *directRoomBorderView;
 @property (weak, nonatomic) IBOutlet UILabel *roomTitleLabel;
 @property (weak, nonatomic) IBOutlet UIImageView *encryptedRoomIcon;
 
@@ -79,7 +78,6 @@
             self.roomTitleLabel.text = [NSBundle mxk_localizedStringForKey:@"room_displayname_empty_room"];
         }  
         
-        self.directRoomBorderView.hidden = !roomCellData.roomSummary.isDirect;
         self.encryptedRoomIcon.hidden = YES;
     }
 }
diff --git a/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.xib b/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.xib
index f64258245..80e07581e 100644
--- a/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.xib
+++ b/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.xib
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -17,11 +13,11 @@
             <rect key="frame" x="0.0" y="0.0" width="600" height="74"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3kk-d5-Wja" id="b83-aU-AJ3">
-                <rect key="frame" x="0.0" y="0.0" width="600" height="73.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="600" height="74"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HJd-Am-cCx" customClass="MXKImageView">
-                        <rect key="frame" x="26" y="16" width="42" height="42"/>
+                        <rect key="frame" x="22" y="16" width="42" height="42"/>
                         <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <accessibility key="accessibilityConfiguration" identifier="AvatarImageView"/>
                         <constraints>
@@ -29,15 +25,8 @@
                             <constraint firstAttribute="width" constant="42" id="Xp0-5S-1wI"/>
                         </constraints>
                     </view>
-                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Fbf-fG-GSb">
-                        <rect key="frame" x="26" y="16" width="42" height="42"/>
-                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstAttribute="width" secondItem="Fbf-fG-GSb" secondAttribute="height" multiplier="1:1" id="1gX-EI-Ffa"/>
-                        </constraints>
-                    </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vBS-iO-8H6">
-                        <rect key="frame" x="82" y="27" width="34" height="20"/>
+                        <rect key="frame" x="78" y="27" width="33" height="20"/>
                         <accessibility key="accessibilityConfiguration" identifier="TitleLabel"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="20" id="H21-1K-fGz"/>
@@ -47,7 +36,7 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="e2e_verified" translatesAutoresizingMaskIntoConstraints="NO" id="hqD-YY-LWz">
-                        <rect key="frame" x="62" y="45" width="11" height="13"/>
+                        <rect key="frame" x="58" y="45" width="11" height="13"/>
                         <accessibility key="accessibilityConfiguration" identifier="EncryptedRoomIcon"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="13" id="8jQ-rK-hf2"/>
@@ -58,11 +47,8 @@
                 <constraints>
                     <constraint firstItem="HJd-Am-cCx" firstAttribute="leading" secondItem="b83-aU-AJ3" secondAttribute="leadingMargin" constant="6" id="4df-2f-865"/>
                     <constraint firstItem="hqD-YY-LWz" firstAttribute="top" secondItem="b83-aU-AJ3" secondAttribute="topMargin" constant="34" id="Cdm-v3-js8"/>
-                    <constraint firstItem="Fbf-fG-GSb" firstAttribute="width" secondItem="HJd-Am-cCx" secondAttribute="width" id="RBA-bw-MFn"/>
                     <constraint firstItem="hqD-YY-LWz" firstAttribute="leading" secondItem="b83-aU-AJ3" secondAttribute="leadingMargin" constant="42" id="UIE-13-LGw"/>
-                    <constraint firstItem="Fbf-fG-GSb" firstAttribute="centerY" secondItem="HJd-Am-cCx" secondAttribute="centerY" id="Xxe-pe-r6t"/>
                     <constraint firstItem="HJd-Am-cCx" firstAttribute="centerY" secondItem="b83-aU-AJ3" secondAttribute="centerY" id="flh-LO-k3n"/>
-                    <constraint firstItem="Fbf-fG-GSb" firstAttribute="centerX" secondItem="HJd-Am-cCx" secondAttribute="centerX" id="oKN-d4-vd0"/>
                     <constraint firstItem="vBS-iO-8H6" firstAttribute="centerY" secondItem="b83-aU-AJ3" secondAttribute="centerY" id="ocY-mt-0n0"/>
                     <constraint firstAttribute="trailingMargin" relation="greaterThanOrEqual" secondItem="vBS-iO-8H6" secondAttribute="trailing" constant="15" id="qqy-zs-Ccy"/>
                     <constraint firstItem="vBS-iO-8H6" firstAttribute="leading" secondItem="HJd-Am-cCx" secondAttribute="trailing" constant="14" id="quv-47-R9n"/>
@@ -72,7 +58,6 @@
             <accessibility key="accessibilityConfiguration" identifier="RoomTableViewCell"/>
             <connections>
                 <outlet property="avatarImageView" destination="HJd-Am-cCx" id="Mv2-Kb-aG4"/>
-                <outlet property="directRoomBorderView" destination="Fbf-fG-GSb" id="aid-IX-joJ"/>
                 <outlet property="encryptedRoomIcon" destination="hqD-YY-LWz" id="Ikp-Sf-Vlc"/>
                 <outlet property="roomTitleLabel" destination="vBS-iO-8H6" id="0J9-p3-Lzx"/>
             </connections>

From 744e747c610da4bf0cfee56fa9301aefce64eac1 Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Thu, 12 Aug 2021 10:07:08 +0100
Subject: [PATCH 3/7] Add changelog entry.

---
 changelog.d/4698.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/4698.bugfix

diff --git a/changelog.d/4698.bugfix b/changelog.d/4698.bugfix
new file mode 100644
index 000000000..121cf9463
--- /dev/null
+++ b/changelog.d/4698.bugfix
@@ -0,0 +1 @@
+People Tab: Fix crash when showing an invite.
\ No newline at end of file

From 751c37c568fe8cf9d809eea16701f4f857845e13 Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Thu, 12 Aug 2021 15:03:53 +0200
Subject: [PATCH 4/7] Remove changelog files by hand

---
 changelog.d/2368.change   | 1 -
 changelog.d/4362.change   | 1 -
 changelog.d/4393.build    | 1 -
 changelog.d/4393.doc      | 1 -
 changelog.d/4480.bugfix   | 1 -
 changelog.d/4520.change   | 1 -
 changelog.d/4575.change   | 1 -
 changelog.d/4596.build    | 1 -
 changelog.d/4609.change   | 1 -
 changelog.d/4642.change   | 1 -
 changelog.d/4655.change   | 1 -
 changelog.d/4656.change   | 1 -
 changelog.d/4671.change   | 1 -
 changelog.d/4671.feature  | 1 -
 changelog.d/4674.doc      | 1 -
 changelog.d/4677.misc     | 1 -
 changelog.d/pr-4689.build | 1 -
 17 files changed, 17 deletions(-)
 delete mode 100644 changelog.d/2368.change
 delete mode 100644 changelog.d/4362.change
 delete mode 100644 changelog.d/4393.build
 delete mode 100644 changelog.d/4393.doc
 delete mode 100644 changelog.d/4480.bugfix
 delete mode 100644 changelog.d/4520.change
 delete mode 100644 changelog.d/4575.change
 delete mode 100644 changelog.d/4596.build
 delete mode 100644 changelog.d/4609.change
 delete mode 100644 changelog.d/4642.change
 delete mode 100644 changelog.d/4655.change
 delete mode 100644 changelog.d/4656.change
 delete mode 100644 changelog.d/4671.change
 delete mode 100644 changelog.d/4671.feature
 delete mode 100644 changelog.d/4674.doc
 delete mode 100644 changelog.d/4677.misc
 delete mode 100644 changelog.d/pr-4689.build

diff --git a/changelog.d/2368.change b/changelog.d/2368.change
deleted file mode 100644
index 7b63bb991..000000000
--- a/changelog.d/2368.change
+++ /dev/null
@@ -1 +0,0 @@
-Settings: The notifications toggle no longer detects the system's "Deliver Quietly" configuration as disabled.
\ No newline at end of file
diff --git a/changelog.d/4362.change b/changelog.d/4362.change
deleted file mode 100644
index 4a9fd4e35..000000000
--- a/changelog.d/4362.change
+++ /dev/null
@@ -1 +0,0 @@
-SSO: Stable ids for MSC 2858.
\ No newline at end of file
diff --git a/changelog.d/4393.build b/changelog.d/4393.build
deleted file mode 100644
index d24a7e191..000000000
--- a/changelog.d/4393.build
+++ /dev/null
@@ -1 +0,0 @@
-CHANGES.md: Use towncrier to manage the change log. More info in [CONTRIBUTING](CONTRIBUTING.md#changelog).
\ No newline at end of file
diff --git a/changelog.d/4393.doc b/changelog.d/4393.doc
deleted file mode 100644
index fa780553b..000000000
--- a/changelog.d/4393.doc
+++ /dev/null
@@ -1 +0,0 @@
-Convert CHANGES to MarkDown.
\ No newline at end of file
diff --git a/changelog.d/4480.bugfix b/changelog.d/4480.bugfix
deleted file mode 100644
index 5cbd09275..000000000
--- a/changelog.d/4480.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-fix typo in email settings
diff --git a/changelog.d/4520.change b/changelog.d/4520.change
deleted file mode 100644
index 1c6a90c72..000000000
--- a/changelog.d/4520.change
+++ /dev/null
@@ -1 +0,0 @@
-Room: Remove the green border from direct message room avatars.
diff --git a/changelog.d/4575.change b/changelog.d/4575.change
deleted file mode 100644
index a51634204..000000000
--- a/changelog.d/4575.change
+++ /dev/null
@@ -1 +0,0 @@
-Settings: Adds a link to open the Settings app to quickly configure app notifications.
diff --git a/changelog.d/4596.build b/changelog.d/4596.build
deleted file mode 100644
index 8a93f4b48..000000000
--- a/changelog.d/4596.build
+++ /dev/null
@@ -1 +0,0 @@
-Add a script to initialize quickly and easily the project.
diff --git a/changelog.d/4609.change b/changelog.d/4609.change
deleted file mode 100644
index 22caf1bf4..000000000
--- a/changelog.d/4609.change
+++ /dev/null
@@ -1 +0,0 @@
-Add support for Functional Members.
\ No newline at end of file
diff --git a/changelog.d/4642.change b/changelog.d/4642.change
deleted file mode 100644
index d933082a9..000000000
--- a/changelog.d/4642.change
+++ /dev/null
@@ -1 +0,0 @@
-VoIP: Additional changes on call tiles.
diff --git a/changelog.d/4655.change b/changelog.d/4655.change
deleted file mode 100644
index e2d72b835..000000000
--- a/changelog.d/4655.change
+++ /dev/null
@@ -1 +0,0 @@
-Voice messages: Allow voice message playback control from the iOS lock screen and control center.
diff --git a/changelog.d/4656.change b/changelog.d/4656.change
deleted file mode 100644
index 05852ed9b..000000000
--- a/changelog.d/4656.change
+++ /dev/null
@@ -1 +0,0 @@
-Voice messages: Stop recording and go into locked mode when the application becomes inactive.
diff --git a/changelog.d/4671.change b/changelog.d/4671.change
deleted file mode 100644
index 4bd61eec5..000000000
--- a/changelog.d/4671.change
+++ /dev/null
@@ -1 +0,0 @@
-Voice messages: Improve audio recording quality.
diff --git a/changelog.d/4671.feature b/changelog.d/4671.feature
deleted file mode 100644
index 4081bc2c2..000000000
--- a/changelog.d/4671.feature
+++ /dev/null
@@ -1 +0,0 @@
-Voice messages: Remove labs setting and enable them by default.
diff --git a/changelog.d/4674.doc b/changelog.d/4674.doc
deleted file mode 100644
index 396acd309..000000000
--- a/changelog.d/4674.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add reference to AppIdentifiers.xcconfig in INSTALL.md.
diff --git a/changelog.d/4677.misc b/changelog.d/4677.misc
deleted file mode 100644
index 69490e109..000000000
--- a/changelog.d/4677.misc
+++ /dev/null
@@ -1 +0,0 @@
-Contacts: Fix implicitly retained self warnings.
diff --git a/changelog.d/pr-4689.build b/changelog.d/pr-4689.build
deleted file mode 100644
index d24a7e191..000000000
--- a/changelog.d/pr-4689.build
+++ /dev/null
@@ -1 +0,0 @@
-CHANGES.md: Use towncrier to manage the change log. More info in [CONTRIBUTING](CONTRIBUTING.md#changelog).
\ No newline at end of file

From c5f818bd9274f973acb5b6ec709a64afaf17819e Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Thu, 12 Aug 2021 15:11:41 +0200
Subject: [PATCH 5/7] Remove changelog files by hand

---
 changelog.d/2368.change   | 1 -
 changelog.d/4362.change   | 1 -
 changelog.d/4393.build    | 1 -
 changelog.d/4393.doc      | 1 -
 changelog.d/4480.bugfix   | 1 -
 changelog.d/4520.change   | 1 -
 changelog.d/4575.change   | 1 -
 changelog.d/4596.build    | 1 -
 changelog.d/4609.change   | 1 -
 changelog.d/4642.change   | 1 -
 changelog.d/4655.change   | 1 -
 changelog.d/4656.change   | 1 -
 changelog.d/4671.change   | 1 -
 changelog.d/4671.feature  | 1 -
 changelog.d/4674.doc      | 1 -
 changelog.d/4677.misc     | 1 -
 changelog.d/pr-4689.build | 1 -
 17 files changed, 17 deletions(-)
 delete mode 100644 changelog.d/2368.change
 delete mode 100644 changelog.d/4362.change
 delete mode 100644 changelog.d/4393.build
 delete mode 100644 changelog.d/4393.doc
 delete mode 100644 changelog.d/4480.bugfix
 delete mode 100644 changelog.d/4520.change
 delete mode 100644 changelog.d/4575.change
 delete mode 100644 changelog.d/4596.build
 delete mode 100644 changelog.d/4609.change
 delete mode 100644 changelog.d/4642.change
 delete mode 100644 changelog.d/4655.change
 delete mode 100644 changelog.d/4656.change
 delete mode 100644 changelog.d/4671.change
 delete mode 100644 changelog.d/4671.feature
 delete mode 100644 changelog.d/4674.doc
 delete mode 100644 changelog.d/4677.misc
 delete mode 100644 changelog.d/pr-4689.build

diff --git a/changelog.d/2368.change b/changelog.d/2368.change
deleted file mode 100644
index 7b63bb991..000000000
--- a/changelog.d/2368.change
+++ /dev/null
@@ -1 +0,0 @@
-Settings: The notifications toggle no longer detects the system's "Deliver Quietly" configuration as disabled.
\ No newline at end of file
diff --git a/changelog.d/4362.change b/changelog.d/4362.change
deleted file mode 100644
index 4a9fd4e35..000000000
--- a/changelog.d/4362.change
+++ /dev/null
@@ -1 +0,0 @@
-SSO: Stable ids for MSC 2858.
\ No newline at end of file
diff --git a/changelog.d/4393.build b/changelog.d/4393.build
deleted file mode 100644
index d24a7e191..000000000
--- a/changelog.d/4393.build
+++ /dev/null
@@ -1 +0,0 @@
-CHANGES.md: Use towncrier to manage the change log. More info in [CONTRIBUTING](CONTRIBUTING.md#changelog).
\ No newline at end of file
diff --git a/changelog.d/4393.doc b/changelog.d/4393.doc
deleted file mode 100644
index fa780553b..000000000
--- a/changelog.d/4393.doc
+++ /dev/null
@@ -1 +0,0 @@
-Convert CHANGES to MarkDown.
\ No newline at end of file
diff --git a/changelog.d/4480.bugfix b/changelog.d/4480.bugfix
deleted file mode 100644
index 5cbd09275..000000000
--- a/changelog.d/4480.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-fix typo in email settings
diff --git a/changelog.d/4520.change b/changelog.d/4520.change
deleted file mode 100644
index 1c6a90c72..000000000
--- a/changelog.d/4520.change
+++ /dev/null
@@ -1 +0,0 @@
-Room: Remove the green border from direct message room avatars.
diff --git a/changelog.d/4575.change b/changelog.d/4575.change
deleted file mode 100644
index a51634204..000000000
--- a/changelog.d/4575.change
+++ /dev/null
@@ -1 +0,0 @@
-Settings: Adds a link to open the Settings app to quickly configure app notifications.
diff --git a/changelog.d/4596.build b/changelog.d/4596.build
deleted file mode 100644
index 8a93f4b48..000000000
--- a/changelog.d/4596.build
+++ /dev/null
@@ -1 +0,0 @@
-Add a script to initialize quickly and easily the project.
diff --git a/changelog.d/4609.change b/changelog.d/4609.change
deleted file mode 100644
index 22caf1bf4..000000000
--- a/changelog.d/4609.change
+++ /dev/null
@@ -1 +0,0 @@
-Add support for Functional Members.
\ No newline at end of file
diff --git a/changelog.d/4642.change b/changelog.d/4642.change
deleted file mode 100644
index d933082a9..000000000
--- a/changelog.d/4642.change
+++ /dev/null
@@ -1 +0,0 @@
-VoIP: Additional changes on call tiles.
diff --git a/changelog.d/4655.change b/changelog.d/4655.change
deleted file mode 100644
index e2d72b835..000000000
--- a/changelog.d/4655.change
+++ /dev/null
@@ -1 +0,0 @@
-Voice messages: Allow voice message playback control from the iOS lock screen and control center.
diff --git a/changelog.d/4656.change b/changelog.d/4656.change
deleted file mode 100644
index 05852ed9b..000000000
--- a/changelog.d/4656.change
+++ /dev/null
@@ -1 +0,0 @@
-Voice messages: Stop recording and go into locked mode when the application becomes inactive.
diff --git a/changelog.d/4671.change b/changelog.d/4671.change
deleted file mode 100644
index 4bd61eec5..000000000
--- a/changelog.d/4671.change
+++ /dev/null
@@ -1 +0,0 @@
-Voice messages: Improve audio recording quality.
diff --git a/changelog.d/4671.feature b/changelog.d/4671.feature
deleted file mode 100644
index 4081bc2c2..000000000
--- a/changelog.d/4671.feature
+++ /dev/null
@@ -1 +0,0 @@
-Voice messages: Remove labs setting and enable them by default.
diff --git a/changelog.d/4674.doc b/changelog.d/4674.doc
deleted file mode 100644
index 396acd309..000000000
--- a/changelog.d/4674.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add reference to AppIdentifiers.xcconfig in INSTALL.md.
diff --git a/changelog.d/4677.misc b/changelog.d/4677.misc
deleted file mode 100644
index 69490e109..000000000
--- a/changelog.d/4677.misc
+++ /dev/null
@@ -1 +0,0 @@
-Contacts: Fix implicitly retained self warnings.
diff --git a/changelog.d/pr-4689.build b/changelog.d/pr-4689.build
deleted file mode 100644
index d24a7e191..000000000
--- a/changelog.d/pr-4689.build
+++ /dev/null
@@ -1 +0,0 @@
-CHANGES.md: Use towncrier to manage the change log. More info in [CONTRIBUTING](CONTRIBUTING.md#changelog).
\ No newline at end of file

From dea1d5f40129f82e4ecdf0835daf588afe85e936 Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Thu, 12 Aug 2021 15:49:07 +0200
Subject: [PATCH 6/7] version++

---
 CHANGES.md                     | 7 +++++++
 Config/AppIdentifiers.xcconfig | 4 ++--
 changelog.d/4698.bugfix        | 1 -
 3 files changed, 9 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/4698.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index e5ce49c60..1433d58ab 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,10 @@
+## Changes in 1.5.1 (2021-08-12)
+
+🐛 Bugfixes
+
+- People Tab: Fix crash when showing an invite. ([#4698](https://github.com/vector-im/element-ios/issues/4698))
+
+
 ## Changes in 1.5.0 (2021-08-11)
 
 ✨ Features
diff --git a/Config/AppIdentifiers.xcconfig b/Config/AppIdentifiers.xcconfig
index 6f557400a..0c7cf37a4 100644
--- a/Config/AppIdentifiers.xcconfig
+++ b/Config/AppIdentifiers.xcconfig
@@ -22,8 +22,8 @@ APPLICATION_GROUP_IDENTIFIER = group.im.vector
 APPLICATION_SCHEME = element
 
 // Version
-MARKETING_VERSION = 1.5.0
-CURRENT_PROJECT_VERSION = 1.5.0
+MARKETING_VERSION = 1.5.1
+CURRENT_PROJECT_VERSION = 1.5.1
 
 
 // Team
diff --git a/changelog.d/4698.bugfix b/changelog.d/4698.bugfix
deleted file mode 100644
index 121cf9463..000000000
--- a/changelog.d/4698.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-People Tab: Fix crash when showing an invite.
\ No newline at end of file