narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity
4753 commits 6 branches 4 tags 61 MiB
Commit graph

56 commits

Author SHA1 Message Date
iNPUTmice 08cb23a886 fixed merge error 2014-11-03 21:22:26 +01:00
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
iNPUTmice a054a3fbb4 use different filter for nfc intents 2014-11-03 21:04:22 +01:00
iNPUTmice 28a186cd6c basic beam code / untested 2014-11-03 20:55:46 +01:00
iNPUTmice 696dd07a41 basic beam code / untested 2014-11-03 20:00:20 +01:00
Sam Whited 281ce3105f Make conversations the root project 2014-10-22 15:47:11 -04:00
Renamed from conversations/src/main/AndroidManifest.xml (Browse further)