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
..
sampledata	textSize 15sp -> android:textAppearance="@style/VectorTextAppearanceSubtitle or Body	2021-06-14 22:10:12 +02:00
signature
src	Merge tag 'v1.1.16' into sc	2021-08-10 09:54:58 +02:00
.gitignore	Update .gitignore for gplay builds	2020-08-09 17:02:51 +02:00
build.gradle	Merge tag 'v1.1.16' into sc	2021-08-10 09:54:58 +02:00
lint.xml	Remove useless parent	2021-06-11 10:22:18 +02:00
proguard-rules.pro	Initial commit jitsi	2020-08-14 09:31:24 +02:00