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
..
sampledata	Split sample step 3: rooms and spaces	2021-05-10 23:07:08 +02:00
signature	Share the debug signature to all machines which build the debug APK	2019-06-07 10:17:14 +02:00
src	Merge tag 'v1.1.8' into sc	2021-05-26 10:44:19 +02:00
.gitignore	Update .gitignore for gplay builds	2020-08-09 17:02:51 +02:00
build.gradle	Merge tag 'v1.1.8' into sc	2021-05-26 10:44:19 +02:00
lint.xml	Ignore lint false positive	2021-05-18 21:23:50 +02:00
proguard-rules.pro	Initial commit jitsi	2020-08-14 09:31:24 +02:00