Sam Whited b234b690c9 Make linter ignore properly checked API mismatch		2014-11-04 11:52:47 -05:00
..
java/eu/siacs/conversations	Make linter ignore properly checked API mismatch	2014-11-04 11:52:47 -05: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