SpiritCroc 98b98c069d [merge] Fix room summary preview mismerge ... Change-Id: I7a1511fc0c6adc1a98cea4a0517835efae83e069		2023-02-11 08:36:41 +01:00
..
androidTest	[Rich text editor] Add inline code to rich text editor (#8011)	2023-01-30 17:35:29 +00:00
debug/res/drawable	Merge tag 'v1.5.0' into merge-v1.5.0	2022-09-23 16:28:00 +02:00
main	[merge] Fix room summary preview mismerge	2023-02-11 08:36:41 +01:00
release/res/drawable	Merge tag 'v1.5.0' into merge-v1.5.0	2022-09-23 16:28:00 +02:00
sharedTest/java/im/vector/app/test/shared
test	Merge pull request #7971 from vector-im/dependabot/gradle/paparazzi-1.2.0	2023-02-07 14:35:21 +01:00