Richard van der Hoff 65b3345317 Merge branch 'master'		2016-10-20 11:43:41 +01:00
..
Axolotl.svg	Rename axolotlpp as olm to avoid confusion with Axolotl-the-spec and Axolotl-the-OWS-libraries at moxie's request	2015-06-27 01:15:23 +02:00
megolm.rst	Add notes on limitations to megolm spec	2016-10-19 19:16:23 +01:00
olm.rst	s/ephemeral/one-time/ in olm spec	2016-10-19 19:18:58 +01:00