sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
parent d1bf9a3f6d 8cb97f517f
commit 52ca2e7391
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
View File

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