SpiritCroc 58f5310e83 Merge tag 'v1.2.0' into sc ... v1.2.0 Change-Id: I900672607ec264e60c96c886d0accb053934fa4a Conflicts: vector/src/main/res/xml/vector_settings_labs.xml		2021-08-12 09:03:42 +02:00
..
androidTest/java/im/vector/app	Standardise spelling and casing of homeserver	2021-07-15 15:58:50 +01:00
debug	Cleanup	2021-07-13 10:27:29 +02:00
fdroid
gplay	Merge tag 'v1.1.8' into sc	2021-05-26 10:44:19 +02:00
main	Merge tag 'v1.2.0' into sc	2021-08-12 09:03:42 +02:00
release	Move test style Activity and layout to the new ui-style module	2021-06-15 18:17:36 +02:00
sharedTest/java/im/vector/app/test/shared
test/java/im/vector/app	Rework colors management	2021-06-09 15:36:20 +02:00