Daniel Gultsch 768d79c621 Merge branch 'issue_#1200' of https://github.com/vikiCoder/Conversations into vikiCoder-issue_#1200		2017-03-03 12:01:00 +01:00
..
java/eu/siacs/conversations	Merge branch 'issue_#1200' of https://github.com/vikiCoder/Conversations into vikiCoder-issue_#1200	2017-03-03 12:01:00 +01:00
res	Merge branch 'issue_#1200' of https://github.com/vikiCoder/Conversations into vikiCoder-issue_#1200	2017-03-03 12:01:00 +01:00
AndroidManifest.xml	transcode videos before sharing. change storage location	2017-01-24 20:17:36 +01:00