summary refs log tree commit diff
path: root/setup.cfg
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-20 16:06:28 +0000
committerErik Johnston <erik@matrix.org>2015-02-20 16:06:28 +0000
commit7367ca42b597f9863819a5dd9fb628273ce71614 (patch)
tree119fb440d82356a352ec007ee0dc09e948a9ce5f /setup.cfg
parentMerge pull request #84 from matrix-org/disable_registration (diff)
parentMerge branch 'hotfixes-v0.7.1-r1' of github.com:matrix-org/synapse (diff)
downloadsynapse-7367ca42b597f9863819a5dd9fb628273ce71614.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions