diff options
author | Erik Johnston <erik@matrix.org> | 2015-02-20 16:06:28 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-02-20 16:06:28 +0000 |
commit | 7367ca42b597f9863819a5dd9fb628273ce71614 (patch) | |
tree | 119fb440d82356a352ec007ee0dc09e948a9ce5f /demo | |
parent | Merge pull request #84 from matrix-org/disable_registration (diff) | |
parent | Merge branch 'hotfixes-v0.7.1-r1' of github.com:matrix-org/synapse (diff) | |
download | synapse-7367ca42b597f9863819a5dd9fb628273ce71614.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions