summary refs log tree commit diff
path: root/contrib/prometheus
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-01-30 16:23:28 +0000
committerRichard van der Hoff <richard@matrix.org>2019-01-30 16:23:28 +0000
commitc74b96755cdd60ac7ca6e2dd925f901220abf437 (patch)
treee6c44730a2d6bade40c16e699f9b0f209153ff1c /contrib/prometheus
parentACME Upgrade Docs (#4528) (diff)
parentMerge pull request #4527 from matrix-org/erikj/fix_sending_remote_invite_reje... (diff)
downloadsynapse-c74b96755cdd60ac7ca6e2dd925f901220abf437.tar.xz
Merge remote-tracking branch 'origin/develop' into release-v0.99.0
Diffstat (limited to 'contrib/prometheus')
0 files changed, 0 insertions, 0 deletions