Conversations/src/main
2014-11-15 15:50:35 +01:00
..
java/eu/siacs/conversations Merge branch 'feature/otr_verification' into development 2014-11-15 15:50:35 +01:00
res Merge branch 'feature/otr_verification' into development 2014-11-15 15:50:35 +01:00
AndroidManifest.xml initial smp support 2014-11-11 17:40:51 +01:00