diff options
| author | Erik Johnston <erik@matrix.org> | 2016-08-18 15:06:31 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-08-18 15:06:31 +0100 |
| commit | 19a625362b5edc8848e583dff3a306a3336191f3 (patch) | |
| tree | f5341a997aa4149ad12bf2317fd384e3171f3862 /synapse/config/api.py | |
| parent | Add appservice worker (diff) | |
| parent | Jenkins: tox install setuptools (diff) | |
| download | synapse-19a625362b5edc8848e583dff3a306a3336191f3.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/appservice_stream
Diffstat (limited to 'synapse/config/api.py')
0 files changed, 0 insertions, 0 deletions