aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceImpl.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'trz/rebase' into trz/renamelookshe2016-04-171-4/+13
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-85/+104
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-061-0/+1021