Daniel Gultsch ba143a2730 Merge branch 'master' of github.com:siacs/Conversations		2016-01-16 22:48:27 +01:00
..
java/eu/siacs/conversations	Merge pull request #1655 from adithyaphilip/pgp-fix	2016-01-16 21:35:38 +01:00
res	pulled translations from transifex	2016-01-16 21:21:14 +01:00
AndroidManifest.xml	ask to be excluded from battery optimization	2016-01-11 11:17:45 +01:00