Merge branch 'develop' into resilience-rc

# Conflicts:
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	RiotSwiftUI/Modules/Room/Composer/View/Composer.swift
#	project.yml
This commit is contained in:
aringenbach
2022-11-07 15:05:25 +01:00
138 changed files with 1484 additions and 637 deletions
@@ -23,4 +23,6 @@ protocol ComposerViewModelProtocol {
var textFormattingEnabled: Bool { get set }
var eventSenderDisplayName: String? { get set }
var placeholder: String? { get set }
func dismissKeyboard()
}