SpiritCroc 27a6b3c79e Merge commit '11b5512cb86369a9c3b50e5b469a8182cce79f52' into sc ... Merge v1.0.5 pt. 6 Conflicts: matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStoreMigration.kt matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/summary/RoomSummaryUpdater.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt		2020-08-22 11:00:23 +02:00
..
src	Merge commit '11b5512cb86369a9c3b50e5b469a8182cce79f52' into sc	2020-08-22 11:00:23 +02:00
.gitignore	first commit	2018-10-03 17:58:12 +02:00
build.gradle	Fix "uploads don't work with Room v6" #1558	2020-07-17 20:33:47 +02:00
lint.xml	Improve lint configuration	2019-04-03 12:04:24 +02:00
proguard-rules.pro	Fix / Serialization issues	2020-07-02 19:26:05 +02:00