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

iNPUTmice created 11 years ago

Conflicts:
	src/main/AndroidManifest.xml

Change summary

src/main/AndroidManifest.xml | 1 +
1 file changed, 1 insertion(+)

Detailed changes

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