summary refs log tree commit diff
path: root/synapse/metrics
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-08-16 16:46:37 +0100
committerDavid Baker <dave@matrix.org>2016-08-16 16:46:37 +0100
commit0bba2799b6eeaf95b52ba9c4f2831def37d8effd (patch)
treef4da51c1d29e54bfa06c4935a188245592a99a90 /synapse/metrics
parents/underride/override/ in the rule_id too (diff)
parentMerge pull request #1015 from matrix-org/erikj/preview_url_fixes (diff)
downloadsynapse-0bba2799b6eeaf95b52ba9c4f2831def37d8effd.tar.xz
Merge remote-tracking branch 'origin/develop' into dbkr/contains_display_name_override
Diffstat (limited to 'synapse/metrics')
0 files changed, 0 insertions, 0 deletions