Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'gradle' into development | Sam Whited | 2014-10-30 | 1 | -0/+161 |
Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib |
index : conversations-plus | ||
improved conversations | lookshe |
aboutsummaryrefslogtreecommitdiffstats |
Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'gradle' into development | Sam Whited | 2014-10-30 | 1 | -0/+161 |
Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib |