Merge commit 'd37edae' into logging_enabled

This commit is contained in:
Richard van der Hoff 2016-06-28 14:16:28 +01:00
commit 2b7c7eef8c
2 changed files with 2 additions and 3 deletions

View file

@ -81,8 +81,7 @@ What's an olm?
~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~
It's a really cool species of European troglodytic salamander. It's a really cool species of European troglodytic salamander.
Matthew once tried to climb into a pool full of them in Postojnska Jama. http://www.postojnska-jama.eu/en/come-and-visit-us/vivarium-proteus/
http://www.postojnska-jama.eu/en/about-the-cave/meet-the-dragon-s-offspring/
Legal Notice Legal Notice
~~~~~~~~~~~~ ~~~~~~~~~~~~

View file

@ -2,7 +2,7 @@ Olm: A Cryptographic Ratchet
============================ ============================
An implementation of the double cryptographic ratchet described by An implementation of the double cryptographic ratchet described by
https://github.com/trevp/axolotl/wiki. https://github.com/trevp/double_ratchet/wiki.
Notation Notation
-------- --------