Benoit Marty d21604b791 Merge pull request #989 from vector-im/feature/qr_code_mistake ... Fix issue with verification when other client declares it can only show QR code (#988)		2020-02-13 19:41:10 +01:00
..
src	Merge pull request #989 from vector-im/feature/qr_code_mistake	2020-02-13 19:41:10 +01:00
.gitignore
build.gradle	Merge branch 'develop' into feature/stabilization_2	2020-01-31 15:47:33 +01:00
lint.xml
proguard-rules.pro