aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/crypto/OtrService.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.5.2' into trz/rebaselookshe2015-08-111-0/+310