summary refs log tree commit diff
path: root/synapse/metrics
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-12-07 13:13:43 +0000
committerMark Haines <mark.haines@matrix.org>2015-12-07 13:13:43 +0000
commitd547afeae0f1e96aafeaa42031e3372c2d95d5a6 (patch)
tree71f661a776fd5ffadcfc570fb433408bb3b8fb19 /synapse/metrics
parentMerge pull request #428 from matrix-org/pusher_api_log (diff)
parentMerge pull request #426 from OlegGirko/fix_mock_import (diff)
downloadsynapse-d547afeae0f1e96aafeaa42031e3372c2d95d5a6.tar.xz
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'synapse/metrics')
0 files changed, 0 insertions, 0 deletions