Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc

Conflicts: src/main/AndroidManifest.xml
2014-11-03 21:07:24 +01:00 · 2014-11-03 21:07:24 +01:00 · 7d7be8efd8
parent a054a3fbb4 696dd07a41
commit 7d7be8efd8
1 changed files with 1 additions and 0 deletions
--- 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