jonnyandrew 5209627f67 Fix merge conflict (#1804)

2023-11-14 16:21:58 +00:00

..

main

Merge pull request #1798 from vector-im/feature/bma/config

2023-11-14 16:53:46 +01:00

test/kotlin/io/element/android/features/messages

Fix merge conflict (#1804)

2023-11-14 16:21:58 +00:00