summary refs log tree commit diff
path: root/synapse/crypto
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-03-18 15:02:43 +0000
committerErik Johnston <erik@matrix.org>2016-03-18 15:02:43 +0000
commit1660145a082470b2d390406a7ed0fed765d44d70 (patch)
treed9c154f0f5ebe5311b74c128f4e17b4846eebbc4 /synapse/crypto
parentYield on EDU handling (diff)
parentMerge pull request #656 from matrix-org/erikj/get_event (diff)
downloadsynapse-1660145a082470b2d390406a7ed0fed765d44d70.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/edu_yield
Diffstat (limited to 'synapse/crypto')
0 files changed, 0 insertions, 0 deletions