summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-03-06 14:23:41 +0000
committerErik Johnston <erik@matrix.org>2015-03-06 14:23:41 +0000
commitc54773473f26ff2c56b4f8ac3e428077757a9724 (patch)
tree1df40ba03f5b996ad44a3710ba7efa991747a642 /synapse/server.py
parentMerge pull request #96 from matrix-org/pushrules2 (diff)
parentMerge pull request #98 from matrix-org/hotfixes-v0.7.1-r4 (diff)
downloadsynapse-c54773473f26ff2c56b4f8ac3e428077757a9724.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions