aringenbach 476f5f6ab6 Merge branch 'develop' into resilience-rc ...

# Conflicts:
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	RiotSwiftUI/Modules/Room/Composer/View/Composer.swift
#	project.yml

2022-11-07 15:05:25 +01:00

..

CreateActionList

fixed a test

2022-10-26 17:35:59 +02:00

Model

Merge branch 'develop' into resilience-rc

2022-11-07 15:05:25 +01:00

Test

fix for 6946

2022-11-02 16:45:40 +01:00

View

Merge branch 'develop' into resilience-rc

2022-11-07 15:05:25 +01:00

ViewModel

Merge branch 'develop' into resilience-rc

2022-11-07 15:05:25 +01:00

MockComposerScreenState.swift

Merge pull request #7027 from vector-im/mauroromito/6946_custom_emojis

2022-11-02 17:31:19 +01:00