Daniel Gultsch 91a69d7d85 use qr codes instead of aztec. Barcode Scanner is terrible at reading aztec. fixes #2375		2017-03-17 12:56:55 +01:00
..
java/eu/siacs/conversations	use qr codes instead of aztec. Barcode Scanner is terrible at reading aztec. fixes #2375	2017-03-17 12:56:55 +01:00
res	use qr codes instead of aztec. Barcode Scanner is terrible at reading aztec. fixes #2375	2017-03-17 12:56:55 +01:00
AndroidManifest.xml	allow Conversations to access user trust store	2017-03-05 11:42:29 +01:00