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:
commit
c02ef80086
|
@ -182,4 +182,4 @@ public class ShareWithActivity extends XmppActivity {
|
|||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue