diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-04-27 18:29:32 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-04-27 18:29:32 +0100 |
| commit | f8b865264a02e263d9b37ac3d9d8bea2e874ed55 (patch) | |
| tree | adc8b964febfad000b5cd1caa19c2a5793a709f8 /LICENSE | |
| parent | Add config for setting the perspective servers (diff) | |
| parent | Merge pull request #132 from matrix-org/observer_and_locks (diff) | |
| download | synapse-f8b865264a02e263d9b37ac3d9d8bea2e874ed55.tar.xz | |
Merge branch 'develop' into key_distribution
Conflicts: synapse/crypto/keyring.py
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions