Merge commit 'ab5f501c2daf60d26f41b1a15d7e97bfe5679228' into feature/4884_merge_foss_1.10.14

# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Home/AllChats/AllChatsCoordinator.swift
#	fastlane/.env.default
#	fastlane/Fastfile
This commit is contained in:
Frank Rotermund
2023-07-04 08:24:05 +02:00
60 changed files with 1658 additions and 288 deletions

View File

@@ -35,6 +35,7 @@ include:
- path: RiotShareExtension/target.yml
- path: SiriIntents/target.yml
- path: RiotNSE/target.yml
- path: BroadcastUploadExtension/target.yml
- path: DesignKit/target.yml
- path: RiotSwiftUI/target.yml
- path: RiotSwiftUI/targetUnitTests.yml
@@ -63,7 +64,7 @@ packages:
maxVersion: 3.5.0
WysiwygComposer:
url: https://github.com/matrix-org/matrix-wysiwyg-composer-swift
version: 2.1.0
version: 2.2.2
DeviceKit:
url: https://github.com/devicekit/DeviceKit
majorVersion: 4.7.0