sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Conflicts:
	src/main/AndroidManifest.xml
This commit is contained in:
iNPUTmice 2014-11-03 21:07:24 +01:00
parent a054a3fbb4 696dd07a41
commit 7d7be8efd8
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/AndroidManifest.xml
View File

@ -65,6 +65,7 @@
<action android:name="android.nfc.action.NDEF_DISCOVERED" /> <action android:name="android.nfc.action.NDEF_DISCOVERED" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:scheme="xmpp" /> <data android:scheme="xmpp" />
<data android:mimeType="application/vnd.eu.siacs.conversations.jid" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity