aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* more error handling in xmppconnectioniNPUTmice2014-11-031-66/+78
|
* Merge branch 'gradle' into developmentSam Whited2014-10-303-50/+46
| | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
* Make conversations the root projectSam Whited2014-10-2233-0/+3387