diff options
| author | Erik Johnston <erik@matrix.org> | 2015-11-11 18:35:16 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-11-11 18:35:16 +0000 |
| commit | 884e601683adf11d8ff8b0fb6bb34188524bf5c5 (patch) | |
| tree | 150e39eaed6280868736efb50f036f72e8033570 /synapse/config | |
| parent | Merge pull request #361 from matrix-org/daniel/guestcontext (diff) | |
| parent | Update date (diff) | |
| download | synapse-884e601683adf11d8ff8b0fb6bb34188524bf5c5.tar.xz | |
Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions