Daniel Gultsch 6b0242523b Merge branch 'master' of https://github.com/Fenisu/Conversations into Fenisu-master		2016-12-02 11:25:14 +01:00
..
java/eu/siacs/conversations	Merge branch 'master' of https://github.com/Fenisu/Conversations into Fenisu-master	2016-12-02 11:25:14 +01:00
res	Merge branch 'master' of https://github.com/Fenisu/Conversations into Fenisu-master	2016-12-02 11:25:14 +01:00
AndroidManifest.xml	made provider authorities relativ to deal with different package ids	2016-12-01 12:09:49 +01:00