SpiritCroc 677330921d Merge tag 'v1.1.16' into sc ... v1.1.16 Change-Id: Id68bd7e36129c9168cc871d81c5c0935b689e1e9 Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt		2021-08-10 09:54:58 +02:00
..
src	Merge tag 'v1.1.16' into sc	2021-08-10 09:54:58 +02:00
.gitignore	…
build.gradle	Bump appcompat from 1.3.0 to 1.3.1	2021-07-22 12:13:24 +00:00
lint.xml	…
proguard-rules.pro	…