Mark Haines 71f23ffce1 Merge branch 'develop' into markjh/megolm ...

Conflicts:
	lib/crypto/algorithms/megolm.js

2016-09-15 17:10:02 +01:00

..

base.js

Handle new device announcements

2016-09-08 14:35:13 +01:00

index.js

Move crypto bits into a subdirectory

2016-09-08 09:50:31 +01:00

megolm.js

Merge branch 'develop' into markjh/megolm

2016-09-15 17:10:02 +01:00

olm.js

Add getKeysProved and getKeysClaimed methods to MatrixEvent.

2016-09-15 16:26:43 +01:00