summary refs log tree commit diff
path: root/synapse/metrics
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-10-04 22:41:52 +1000
committerAmber Brown <hawkowl@atleastfornow.net>2018-10-04 22:41:52 +1000
commitd86794325f770f4d4e9a13a993809a53b58d9122 (patch)
tree42b83cb83e654a1bb89d5da4a2c69ac843ed2ee9 /synapse/metrics
parentMerge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetion (diff)
parentchangelog (diff)
downloadsynapse-d86794325f770f4d4e9a13a993809a53b58d9122.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/metrics')
0 files changed, 0 insertions, 0 deletions