aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/utils/ExifHelper.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-101-1/+1
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-021-6/+6
|\|
| * renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-161/+0
|/ | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
* Merge branch 'gradle' into developmentSam Whited2014-10-301-0/+161
Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib