Daniel Gultsch da298cfe59 Merge branch 'master' of github.com:siacs/Conversations		2016-01-12 23:41:35 +01:00
..
java/eu/siacs/conversations	move some ssl socket modifiers into a seperate helper class	2016-01-12 16:33:15 +01:00
res	Merge branch 'master' of github.com:siacs/Conversations	2016-01-12 23:41:35 +01:00
AndroidManifest.xml	ask to be excluded from battery optimization	2016-01-11 11:17:45 +01:00