aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceStub.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-171-0/+5
* Fixed merge issue with AxolotlService (differentiation between impl and inter...steckbrief2016-03-081-35/+46
* Fixes FS#147: Disable OMEMOsteckbrief2016-03-021-0/+196