aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/utils/ExifHelper.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'gradle' into developmentSam Whited2014-10-301-0/+161
Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib