diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-08-28 11:15:27 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-08-28 11:15:27 +0100 |
| commit | a7122692d972ce3ac787d4ecf1449f87f33e83cf (patch) | |
| tree | 81ece372c764d775d1d10cc581100de006456d67 /synapse/events | |
| parent | Merge pull request #254 from matrix-org/markjh/tox_setuptools (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-a7122692d972ce3ac787d4ecf1449f87f33e83cf.tar.xz | |
Merge branch 'release-v0.10.0' into develop
Conflicts: synapse/handlers/auth.py synapse/python_dependencies.py synapse/rest/client/v1/login.py
Diffstat (limited to 'synapse/events')
0 files changed, 0 insertions, 0 deletions