aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values/strings.xml (follow)
Commit message (Collapse)AuthorAgeFilesLines
* unfinishd qr code implemenation. thanks to @emdeteiNPUTmice2014-11-031-1/+2
|
* Merge branch 'gradle' into developmentSam Whited2014-10-301-5/+15
| | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
* Make conversations the root projectSam Whited2014-10-221-0/+276