diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-03 11:59:57 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-03 12:01:14 +0100 |
| commit | b50ea730b15706d0e2099f94cf8b3cf24b5c5433 (patch) | |
| tree | 05fb4bb1190f0f2223de49bf17060481a8bfad70 /synapse/__init__.py | |
| parent | Add option to change content repo location (diff) | |
| parent | Edited /presence REST servlet to raise SynapseErrors to return a standard err... (diff) | |
| download | synapse-b50ea730b15706d0e2099f94cf8b3cf24b5c5433.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Conflicts:
synapse/http/server.py
synapse/http/content_repository.py
Diffstat (limited to 'synapse/__init__.py')
0 files changed, 0 insertions, 0 deletions