aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Collapse)AuthorAgeFilesLines
* unfinishd qr code implemenation. thanks to @emdeteiNPUTmice2014-11-033-7/+20
|
* Wrap "last seen" time.Sam Whited2014-11-031-2/+1
| | | | Fixes #611
* Merge branch 'gradle' into developmentSam Whited2014-10-3013-23/+90
| | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
* Make conversations the root projectSam Whited2014-10-22210-0/+6157