iNPUTmice 84b2ce10b7 Merge branch 'development' of https://github.com/siacs/Conversations into development		2014-11-16 12:28:21 +01:00
..
java/eu/siacs/conversations	Merge branch 'development' of https://github.com/siacs/Conversations into development	2014-11-16 12:28:21 +01:00
res	made scan and show qr code more accessible in VerifyOtrActivity	2014-11-16 02:10:29 +01:00
AndroidManifest.xml	initial smp support	2014-11-11 17:40:51 +01:00