diff options
author | Erik Johnston <erik@matrix.org> | 2019-10-11 10:40:15 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-10-11 10:40:15 +0100 |
commit | 4a4e620f3080921bc8ba218f8404859c7457b592 (patch) | |
tree | dea15c4ab99bb9a4244373a18ef0c98250d0ae64 /synapse/config/metrics.py | |
parent | fix logging (diff) | |
parent | Fix MAU reaping where reserved users are specified. (#6168) (diff) | |
download | synapse-4a4e620f3080921bc8ba218f8404859c7457b592.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/metrics.py')
-rw-r--r-- | synapse/config/metrics.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/config/metrics.py b/synapse/config/metrics.py |