diff options
author | Erik Johnston <erik@matrix.org> | 2014-09-25 18:21:42 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-09-25 18:21:42 +0100 |
commit | 7a8307fe7c3f6b13c78681f1eb320149238828ca (patch) | |
tree | 8693ec59f906c076abb534f01c32573619bf7c8c /synapse/server.py | |
parent | Add realm to coturn options (it needs it). (diff) | |
parent | Merge branch 'release-v0.3.4' of github.com:matrix-org/synapse (diff) | |
download | synapse-7a8307fe7c3f6b13c78681f1eb320149238828ca.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions