summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-09-05 11:53:11 +0100
committerErik Johnston <erik@matrix.org>2016-09-05 11:53:11 +0100
commitbb36b93f71bc6f11401cb1154f7415f0b9326009 (patch)
tree69f8c8fd451458844ceb830df9dbe8332b3d0d0a /synapse/config
parentAdd comments (diff)
parentMerge pull request #1067 from matrix-org/markjh/idempotent (diff)
downloadsynapse-bb36b93f71bc6f11401cb1154f7415f0b9326009.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions