diff options
| author | David Baker <dave@matrix.org> | 2015-01-22 17:46:16 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-01-22 17:46:16 +0000 |
| commit | 5c6189ea3eb36409c57cd269a8931dda8f30e6ec (patch) | |
| tree | 6a6217c76e23359e2edcebd1020b4807f18b3073 /synapse/config/__init__.py | |
| parent | Oops: second part of commit dc938606 (diff) | |
| parent | Merge pull request #30 from matrix-org/client_api_restructure (diff) | |
| download | synapse-5c6189ea3eb36409c57cd269a8931dda8f30e6ec.tar.xz | |
Merge branch 'develop' into pushers
Conflicts: synapse/rest/__init__.py
Diffstat (limited to 'synapse/config/__init__.py')
0 files changed, 0 insertions, 0 deletions