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
..
assets	Uniform emoji representation for all platform	2020-04-10 11:02:33 +02:00
java/im/vector/riotx	Merge branch 'develop' into feature/target-sdk-29	2020-04-14 13:59:54 +03:00
res	Merge branch 'develop' into feature/verification_unified_emoji	2020-04-10 16:05:33 +02:00
AndroidManifest.xml	Initial implementation of multipicker.	2020-03-20 12:12:59 +03:00