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