diff options
| author | Erik Johnston <erik@matrix.org> | 2016-03-30 14:41:31 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-03-30 14:41:31 +0100 |
| commit | d24662b88a59c872db4b5d96d2c5bec3c80294ca (patch) | |
| tree | 28ec78dfcf1c8fe27c86709b5afea83d38a31556 /synapse/streams/config.py | |
| parent | Merge pull request #671 from nikriek/jwt-support (diff) | |
| parent | Merge branch 'release-v0.14.0' of github.com:matrix-org/synapse (diff) | |
| download | synapse-d24662b88a59c872db4b5d96d2c5bec3c80294ca.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/streams/config.py')
0 files changed, 0 insertions, 0 deletions