Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | unfinishd qr code implemenation. thanks to @emdete | iNPUTmice | 2014-11-03 | 1 | -9/+87 |
| | |||||
* | Merge branch 'gradle' into development | Sam Whited | 2014-10-30 | 1 | -14/+1 |
| | | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib | ||||
* | Make conversations the root project | Sam Whited | 2014-10-22 | 1 | -0/+423 |