summary refs log tree commit diff
path: root/synapse/crypto
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-13 14:34:01 +0100
committerErik Johnston <erik@matrix.org>2015-10-13 14:34:01 +0100
commit323d3e506ded7a2eefc1d234b771b7ca62c0ca24 (patch)
tree1e8af5e6a413b4e5933cde97024ccc05e7951a12 /synapse/crypto
parentMerge branch 'erikj/store_engine' into erikj/search (diff)
parentMerge pull request #301 from matrix-org/markjh/v2_filtering (diff)
downloadsynapse-323d3e506ded7a2eefc1d234b771b7ca62c0ca24.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
Diffstat (limited to 'synapse/crypto')
0 files changed, 0 insertions, 0 deletions