SpiritCroc 6c06462ec9 Merge tag 'v1.1.8' into sc ... Change-Id: Ied7cd01e47a76e9d8f546ae1c2d6f10b083c4480 Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt		2021-05-26 10:44:19 +02:00
..
src	Merge tag 'v1.1.8' into sc	2021-05-26 10:44:19 +02:00
.gitignore
build.gradle	Bump appcompat from 1.2.0 to 1.3.0	2021-05-19 06:20:33 +00:00
lint.xml
proguard-rules.pro	Remove dependency to org.greenrobot.eventbus library	2021-01-05 18:56:24 +01:00