SpiritCroc acb12c2005 Merge tag 'v1.1.14' into sc ... Change-Id: I7668fc7603c8f6e7aafa89886bb0fdf586e4a871 Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt		2021-07-24 10:12:48 +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	Rename parameters for clarity	2021-01-12 16:07:49 +01:00
gplay	Merge tag 'v1.1.8' into sc	2021-05-26 10:44:19 +02:00
main	Merge tag 'v1.1.14' into sc	2021-07-24 10:12:48 +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	Rename package im.vector.riotx to im.vector.app (IDE)	2020-08-03 18:46:29 +02:00
test/java/im/vector/app	Rework colors management	2021-06-09 15:36:20 +02:00