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
..
src	Merge tag 'v1.1.14' into sc	2021-07-24 10:12:48 +02:00
.gitignore	first commit	2018-10-03 17:58:12 +02:00
build.gradle	Bump appcompat from 1.3.0 to 1.3.1	2021-07-22 12:13:24 +00:00
lint.xml	Set severity of ObsoleteSdkInt to error	2020-08-18 00:46:37 +02:00
proguard-rules.pro	Remove dependency to org.greenrobot.eventbus library	2021-01-05 18:56:24 +01:00