moparisthebest
/
Conversations
mirror of https://github.com/moparisthebest/Conversations
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:siacs/Conversations 

Conflicts:
	src/eu/siacs/conversations/crypto/PgpEngine.java
	src/eu/siacs/conversations/persistance/FileBackend.java
	src/eu/siacs/conversations/ui/ShareWithActivity.java
This commit is contained in:
iNPUTmice 2014-09-09 14:16:51 +02:00
parent facb1242b6 0f4ba6101c
commit c02ef80086
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/eu/siacs/conversations/ui/ShareWithActivity.java
View File

@ -182,4 +182,4 @@ public class ShareWithActivity extends XmppActivity {
}
}
}