| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Merge branch 'gradle' into development | Sam Whited | 2014-10-30 | 1 | -7/+23 | |
| | | | | | | | | | | | 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/+269 | |
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |