diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-07-27 15:11:02 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-07-27 15:11:02 +0100 |
| commit | 29b25d59c6de7da759f152fbcaba0e323a75af71 (patch) | |
| tree | 508289fc88ee4b51b6c0bd5bd49538809f5a2bbf /synapse/config/voip.py | |
| parent | Clean up verify_json_objects_for_server (diff) | |
| parent | Merge pull request #955 from matrix-org/markjh/only_from2 (diff) | |
| download | synapse-29b25d59c6de7da759f152fbcaba0e323a75af71.tar.xz | |
Merge branch 'develop' into markjh/verify
Conflicts: synapse/crypto/keyring.py
Diffstat (limited to 'synapse/config/voip.py')
0 files changed, 0 insertions, 0 deletions