diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-08-13 17:27:53 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-08-13 17:27:53 +0100 |
| commit | c5966b2a97090bf5b1e2ced83e3f424a3f4d4cad (patch) | |
| tree | 3cc3a75259e130906b963570e2c747f5ab0cba2d /MAP.rst | |
| parent | Add a few strategic new lines to break up the on_query_client_keys and on_cla... (diff) | |
| parent | Merge pull request #224 from matrix-org/erikj/reactor_metrics (diff) | |
| download | synapse-c5966b2a97090bf5b1e2ced83e3f424a3f4d4cad.tar.xz | |
Merge remote-tracking branch 'origin/develop' into markjh/end-to-end-key-federation
Diffstat (limited to 'MAP.rst')
0 files changed, 0 insertions, 0 deletions