Daniel Gultsch 6d3be890b7 Merge branch 'qr_scan_fix' of https://github.com/klonfish/Conversations into klonfish-qr_scan_fix		2018-03-20 09:04:17 +01:00
..
java/eu/siacs/conversations	Merge branch 'qr_scan_fix' of https://github.com/klonfish/Conversations into klonfish-qr_scan_fix	2018-03-20 09:04:17 +01:00
res	pulled translations from transifex	2018-03-19 21:06:39 +01:00
AndroidManifest.xml	Merge branch 'master' of github.com:siacs/Conversations	2018-03-14 08:22:18 +01:00