aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceImpl.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-201-8/+4
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-05-091-1/+3
* @Overrides addedlookshe2016-04-171-0/+6
* Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-171-10/+12
* Fixed merge issue with AxolotlService (differentiation between impl and inter...steckbrief2016-03-081-85/+104
* Fixes FS#147: Disable OMEMOsteckbrief2016-03-021-0/+1022