Daniel Gultsch 5dd5685885 Merge pull request #1641 from fiaxh/uuid-fix ... Correct uuid check according to RFC 4122		2016-01-08 00:17:21 +01:00
..
java/eu/siacs/conversations	Merge pull request #1641 from fiaxh/uuid-fix	2016-01-08 00:17:21 +01:00
res	Allow entering a JID from 'choose contact'. thanks @singpolyma	2016-01-04 17:27:54 +01:00
AndroidManifest.xml	implement direct sharing in android 6.0. fixes #1321	2015-12-07 13:24:41 +01:00