cogentleman/xmpp_client
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7d7be8efd8
xmpp_client/src
History
iNPUTmice 7d7be8efd8 Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc 
Conflicts:
	src/main/AndroidManifest.xml
2014-11-03 21:07:24 +01:00
..
main Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc 2014-11-03 21:07:24 +01:00