aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-03 21:07:24 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-03 21:07:24 +0100
commit7d7be8efd8eef3b9fcadf83766dd26fb139e0976 (patch)
tree4dadb47aee41a7533e7fd6339a02de69b17a388d /src/main
parenta054a3fbb446a89ac479393c1e5f9e3f6396bacd (diff)
parent696dd07a41b638ead79d5a384a96c1cd923a7545 (diff)
Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc
Conflicts: src/main/AndroidManifest.xml
Diffstat (limited to 'src/main')
-rw-r--r--src/main/AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 95663a87..db503ae8 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -65,6 +65,7 @@
<action android:name="android.nfc.action.NDEF_DISCOVERED" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="xmpp" />
+ <data android:mimeType="application/vnd.eu.siacs.conversations.jid" />
</intent-filter>
</activity>
<activity