M. Dietrich fb24bf98c9 be more OO		2014-11-04 10:49:10 +01:00
..
java/eu/siacs/conversations	be more OO	2014-11-04 10:49:10 +01:00
res	unfinishd qr code implemenation. thanks to @emdete	2014-11-03 22:47:07 +01:00
AndroidManifest.xml	fixed merge error	2014-11-03 21:22:26 +01:00