diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-04-22 16:26:57 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-04-22 16:26:57 +0100 |
| commit | 62607d5452ec191039d326aefde6416eea34cb39 (patch) | |
| tree | c66b0659ff408ad425c8270a8a428310248f911c /synapse/config | |
| parent | Move SynapseSite to its own file (diff) | |
| parent | Merge pull request #747 from matrix-org/markjh/http_resource_tree (diff) | |
| download | synapse-62607d5452ec191039d326aefde6416eea34cb39.tar.xz | |
Merge branch 'develop' into markjh/split_out_site.py
Conflicts: synapse/app/homeserver.py
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions