Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | fixed merge error | iNPUTmice | 2014-11-03 | 1 | -1/+0 | |
* | Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc | iNPUTmice | 2014-11-03 | 1 | -0/+1 | |
|\ | ||||||
| * | basic beam code / untested | iNPUTmice | 2014-11-03 | 1 | -22/+20 | |
* | | use different filter for nfc intents | iNPUTmice | 2014-11-03 | 1 | -1/+1 | |
* | | basic beam code / untested | iNPUTmice | 2014-11-03 | 1 | -22/+20 | |
|/ | ||||||
* | Make conversations the root project | Sam Whited | 2014-10-22 | 1 | -0/+118 |