diff options
author | pedroGitt <pedro.contreiras@amdocs.com> | 2016-11-23 00:04:58 +0100 |
---|---|---|
committer | pedroGitt <pedro.contreiras@amdocs.com> | 2016-11-23 00:04:58 +0100 |
commit | 7a6897642baa8fc5d9d9f14c80fc4f201cfe2173 (patch) | |
tree | 9325a7d7d3ac40747f49af22378dcf9bc5c0dd0b /README.rst | |
parent | c725a561a283f508e68516ded86d141214f5ea06 (diff) | |
parent | f6c05be8c5d35e725a8a2ed5ad661398ac9f8cd2 (diff) |
Merge remote-tracking branch 'origin/master' into pedroc/android_e2e_dev
Diffstat (limited to 'README.rst')
-rw-r--r-- | README.rst | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -5,8 +5,12 @@ An implementation of the Double Ratchet cryptographic ratchet described by https://github.com/trevp/double_ratchet/wiki, written in C and C++11 and exposed as a C API. -The specification of the Olm ratchet can be found in docs/olm.rst or -https://matrix.org/docs/spec/olm.html +The specification of the Olm ratchet can be found in ``docs/olm.rst`` or +https://matrix.org/docs/spec/olm.html. + +This library also includes an implementation of the Megolm cryptographic +ratchet, as specified in ``docs/megolm.rst`` or +https://matrix.org/docs/spec/megolm.html. Building -------- |