Daniel Gultsch b0fb9fd9ee added nick to conference jid example		2016-09-28 13:20:52 +02:00
..
java/eu/siacs/conversations	Merge pull request #2027 from danielegobbetti/wear-reply-dismiss-notification	2016-09-28 12:39:00 +02:00
res	added nick to conference jid example	2016-09-28 13:20:52 +02:00
AndroidManifest.xml	fixed recreation issues in StartConversationActivity	2016-08-31 17:04:43 +02:00