diff options
| author | Erik Johnston <erik@matrix.org> | 2017-01-09 14:51:17 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-01-09 14:51:17 +0000 |
| commit | 9898bbd9dc60653cd0186460c0014505195ed874 (patch) | |
| tree | af4ffd4da02bc3c917537b4882010d776f9c6b5d /synapse/api | |
| parent | gah, fix mangled merge of 0.18.7 into develop (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-9898bbd9dc60653cd0186460c0014505195ed874.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions