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
..
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