aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-09-09 14:16:51 +0200
committeriNPUTmice <daniel@gultsch.de>2014-09-09 14:16:51 +0200
commitc02ef8008621049b803803fd131626c2365035ae (patch)
treecbfdcafb0c71cfd58322c6816b1a17a54d999f44 /src/eu/siacs
parentfacb1242b6694ea2d4ed5c7dbd92e4a96d288ea3 (diff)
parent0f4ba6101c535a5373302bcfa2f77deb6ad42d3d (diff)
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
Diffstat (limited to 'src/eu/siacs')
-rw-r--r--src/eu/siacs/conversations/ui/ShareWithActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/ui/ShareWithActivity.java b/src/eu/siacs/conversations/ui/ShareWithActivity.java
index 92f5d8bb..9fbc3db1 100644
--- a/src/eu/siacs/conversations/ui/ShareWithActivity.java
+++ b/src/eu/siacs/conversations/ui/ShareWithActivity.java
@@ -182,4 +182,4 @@ public class ShareWithActivity extends XmppActivity {
}
-}
+} \ No newline at end of file