aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/crypto/OtrService.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Imports organizedsteckbrief2016-02-121-8/+1
* Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-14/+17
|\
| * use same method to add message hints to otr message everywhere it is neededDaniel Gultsch2015-09-011-4/+2
| * and now do that properlyDaniel Gultsch2015-07-211-1/+1
| * bugfix: also add no-permanent-storage to message hintsDaniel Gultsch2015-07-211-1/+1
| * Optimize importsAndreas Straub2015-07-201-16/+15
| * renamed OtrEngine to OtrServiceDaniel Gultsch2015-05-261-0/+310
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-02-091-0/+1
* 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-8/+8
* Merge trz/rename into trz/rebasesteckbrief2015-10-221-1/+2
* Merge tag '1.5.2' into trz/rebaselookshe2015-08-111-0/+310