aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/menu (follow)
Commit message (Collapse)AuthorAgeFilesLines
* made file transfers cancelableiNPUTmice2014-11-151-0/+3
|
* basic arbitrary file transferiNPUTmice2014-11-151-2/+1
|
* made qr code available from muc and contact details as welliNPUTmice2014-11-042-0/+8
|
* unfinishd qr code implemenation. thanks to @emdeteiNPUTmice2014-11-032-6/+18
|
* Merge branch 'gradle' into developmentSam Whited2014-10-301-0/+20
| | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
* Make conversations the root projectSam Whited2014-10-2212-0/+256