summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-13 17:18:52 +0100
committerErik Johnston <erik@matrix.org>2015-08-13 17:18:52 +0100
commit3d77e56c1283c0100fe8ecd11ea08d3a341296ef (patch)
tree4f8e54516ca642b3b36d6602261c91fe409f9662 /synapse
parentRemove some vertical space (diff)
parentMerge pull request #224 from matrix-org/erikj/reactor_metrics (diff)
downloadsynapse-3d77e56c1283c0100fe8ecd11ea08d3a341296ef.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache
Diffstat (limited to 'synapse')
0 files changed, 0 insertions, 0 deletions