diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-14 17:40:59 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-08-14 17:40:59 +0100 |
| commit | 70e48cbbb1f0975739135ba52fdcc0fb660d7a4c (patch) | |
| tree | f9276dd9e8b5f7ca6861e5924c449d7ca6ac48bf /changelog.d | |
| parent | Rename MAU prometheus metric (diff) | |
| parent | Merge pull request #3692 from matrix-org/neil/fix_postgres_test_initialise_re... (diff) | |
| download | synapse-70e48cbbb1f0975739135ba52fdcc0fb660d7a4c.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/change_prometheus_mau_metric_name
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/3670.feature | 1 | ||||
| -rw-r--r-- | changelog.d/3692.bugfix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/3670.feature b/changelog.d/3670.feature new file mode 100644 index 0000000000..ba00f2d2ec --- /dev/null +++ b/changelog.d/3670.feature @@ -0,0 +1 @@ +Where server is disabled, block ability for locked out users to read new messages diff --git a/changelog.d/3692.bugfix b/changelog.d/3692.bugfix new file mode 100644 index 0000000000..f44e13dca1 --- /dev/null +++ b/changelog.d/3692.bugfix @@ -0,0 +1 @@ +Fix missing yield in synapse.storage.monthly_active_users.initialise_reserved_users |