summary refs log tree commit diff
path: root/res
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-14 17:40:59 +0100
committerNeil Johnson <neil@matrix.org>2018-08-14 17:40:59 +0100
commit70e48cbbb1f0975739135ba52fdcc0fb660d7a4c (patch)
treef9276dd9e8b5f7ca6861e5924c449d7ca6ac48bf /res
parentRename MAU prometheus metric (diff)
parentMerge pull request #3692 from matrix-org/neil/fix_postgres_test_initialise_re... (diff)
downloadsynapse-70e48cbbb1f0975739135ba52fdcc0fb660d7a4c.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/change_prometheus_mau_metric_name
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions