Conversations/src/main
2014-11-04 12:15:14 +01:00
..
java/eu/siacs/conversations made qr code available from muc and contact details as well 2014-11-04 12:15:14 +01:00
res made qr code available from muc and contact details as well 2014-11-04 12:15:14 +01:00
AndroidManifest.xml fixed merge error 2014-11-03 21:22:26 +01:00