SpiritCroc f5dcf25a6d Merge tag 'v1.5.13' into sc ... Change-Id: I16e8750adb88c86ad6af84f60d904fd5e16d2f13		2022-12-19 18:04:43 +01:00
..
androidTest/java/im/vector/app	added UI tests for new App Layout's screens (#7305)	2022-10-24 11:01:44 +02:00
debug	Merge remote-tracking branch 'upstream/develop' into sc	2022-12-07 14:56:07 +01:00
fdroid	Merge tag 'v1.5.12' into sc	2022-12-15 11:01:52 +01:00
gplay	[merge] Fix gplay build	2022-12-15 11:45:48 +01:00
main	Merge tag 'v1.5.13' into sc	2022-12-19 18:04:43 +01:00
nightly/res/xml	lifting nightly to the application module	2022-09-15 14:50:08 +01:00
release	Merge tag 'v1.5.0' into merge-v1.5.0	2022-09-23 16:28:00 +02:00