summary refs log tree commit diff
path: root/synapse/events
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-13 11:55:20 +0100
committerErik Johnston <erik@matrix.org>2015-08-13 11:55:20 +0100
commit06750140f61dadcfcd07a384714e5cf094c5d3b4 (patch)
treee5c28ebdf5f20df0f3002fcbf1a8a0c77c23f451 /synapse/events
parentMerge branch 'erikj/reactor_metrics' into erikj/dictionary_cache (diff)
parentPEP8 (diff)
downloadsynapse-06750140f61dadcfcd07a384714e5cf094c5d3b4.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache
Diffstat (limited to 'synapse/events')
0 files changed, 0 insertions, 0 deletions