iNPUTmice 35bf13f5ef Merge branch 'feature/file_transfer' into development ... Conflicts: src/main/res/values/strings.xml		2014-11-15 15:52:15 +01:00
..
siacs/conversations	Merge branch 'feature/file_transfer' into development	2014-11-15 15:52:15 +01:00