Sam Whited d94b07c916 Make account status an enum		2014-11-15 11:12:41 -05:00
..
java/eu/siacs/conversations	Make account status an enum	2014-11-15 11:12:41 -05:00
res	Merge branch 'feature/file_transfer' into development	2014-11-15 15:52:15 +01:00
AndroidManifest.xml	initial smp support	2014-11-11 17:40:51 +01:00