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
commit c02ef80086

View file

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