Merge branch 'feature/otr_verification' of https://github.com/siacs/Conversations into feature/otr_verification

Conflicts:
	src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
This commit is contained in:
iNPUTmice 2014-11-11 17:45:16 +01:00
commit 52ca2e7391

View file

@ -272,7 +272,6 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer
}
}
@Override
public void onConversationUpdate() {
runOnUiThread(new Runnable() {
@Override