summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-11-01 11:57:28 +0000
committerErik Johnston <erik@matrix.org>2016-11-01 11:57:28 +0000
commitf6e8019b9c8e94450327e10cffafe95882a656f3 (patch)
tree820a9c2b0f78a6460478786753bb7eb4b55726bb /synapse/api
parentChangelog formattting (diff)
parentMerge pull request #1187 from matrix-org/paul/metrics-howto (diff)
downloadsynapse-f6e8019b9c8e94450327e10cffafe95882a656f3.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.2
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions