diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-07-06 18:48:27 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-07-06 18:48:27 +0100 |
| commit | 28ef3440772794d009bb168c400c63fc53515f1a (patch) | |
| tree | 610090e8bfb3c1e6b61579d756a484ee6d895107 /synapse/storage | |
| parent | Add client API for uploading and querying keys for end to end encryption (diff) | |
| parent | Don't 500 if a group is missing from the regex (diff) | |
| download | synapse-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