onurays 190fbb95ec Merge branch 'develop' into feature/target-sdk-29 ... # Conflicts: # vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt		2020-04-14 13:59:54 +03:00
..
java/im/vector/riotx	Merge branch 'develop' into feature/target-sdk-29	2020-04-14 13:59:54 +03:00
res	Create dedicated View and Epoxy item for QrCode	2020-01-28 15:48:09 +01:00
AndroidManifest.xml	Add debug screen for all SAS emoji	2019-11-07 10:37:49 +01:00