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
..
androidTest/java/org/matrix/android/sdk	Standardise spelling and casing of homeserver	2021-07-15 15:58:50 +01:00
debug/java/org/matrix/android/sdk/internal/network/interceptors
main	Merge tag 'v1.1.16' into sc	2021-08-10 09:54:58 +02:00
release/java/org/matrix/android/sdk/internal/network/interceptors
sharedTest/java/org/matrix/android/sdk/test/shared
test/java/org/matrix/android/sdk	Follow the spec regarding waveform content	2021-07-13 17:58:14 +02:00