git.bettercrypto.org / ach-master.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 57e48ae 3ae8690)
Merge pull request #90 from malexmave/ejabberd-update
authorAaron Zauner <azet@azet.org>
Thu, 3 Mar 2016 23:23:53 +0000 (00:23 +0100)
committerAaron Zauner <azet@azet.org>
Thu, 3 Mar 2016 23:23:53 +0000 (00:23 +0100)
Updated for newer versions of ejabberd

1  2 
src/acknowledgements.tex patch | diff1 | diff2 | blob | history
src/practical_settings/im.tex patch | diff1 | diff2 | blob | history

diff --cc src/acknowledgements.tex
Simple merge
diff --cc src/practical_settings/im.tex
Simple merge
applied crypto hardening (master repo)