aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/Config.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'gradle' into developmentSam Whited2014-10-301-0/+1
| | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
* Make conversations the root projectSam Whited2014-10-221-0/+25