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/org/matrix/android/sdk	Standardise spelling and casing of homeserver	2021-07-15 15:58:50 +01:00
debug/java/org/matrix/android/sdk/internal/network/interceptors	Move interface to correct location	2021-01-07 18:28:05 +01:00
main	Merge tag 'v1.1.14' into sc	2021-07-24 10:12:48 +02:00
release/java/org/matrix/android/sdk/internal/network/interceptors
sharedTest/java/org/matrix/android/sdk/test/shared
test/java/org/matrix/android/sdk	Use Junit import	2021-05-04 10:50:31 +02:00