Sam Whited 55957a77b3 Fix linter suppression		2014-11-17 09:19:11 -05:00
..
java/eu/siacs/conversations	Fix linter suppression	2014-11-17 09:19:11 -05:00
res	Merge branch 'development' of https://github.com/siacs/Conversations into development	2014-11-17 01:54:19 +01:00
AndroidManifest.xml	initial smp support	2014-11-11 17:40:51 +01:00