Daniel Gultsch c7ec82679f Merge branch 'master' of github.com:siacs/Conversations		2017-02-24 20:00:54 +01:00
..
java/eu/siacs/conversations	Merge branch 'master' of github.com:siacs/Conversations	2017-02-24 20:00:54 +01:00
res	pulled translations from transifex	2017-02-10 14:19:36 +01:00
AndroidManifest.xml	transcode videos before sharing. change storage location	2017-01-24 20:17:36 +01:00