| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1 | lookshe | 2015-08-11 | 1 | -5/+4 |
| | | |||||
| * | whatsapp-like smiley implementation | lookshe | 2015-04-12 | 1 | -3/+6 |
| | | |||||
| * | Merge branch 'gradle' into development | Sam Whited | 2014-10-30 | 1 | -2/+2 |
| | | | | | | | | | | | 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/+97 |
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |