summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-07-06 18:48:27 +0100
committerMark Haines <mark.haines@matrix.org>2015-07-06 18:48:27 +0100
commit28ef3440772794d009bb168c400c63fc53515f1a (patch)
tree610090e8bfb3c1e6b61579d756a484ee6d895107 /synapse/storage
parentAdd client API for uploading and querying keys for end to end encryption (diff)
parentDon't 500 if a group is missing from the regex (diff)
downloadsynapse-28ef3440772794d009bb168c400c63fc53515f1a.tar.xz
Merge branch 'mjark/missing_regex_group' into markjh/client-end-to-end-key-management
Diffstat (limited to 'synapse/storage')
0 files changed, 0 insertions, 0 deletions