diff options
| author | Erik Johnston <erik@matrix.org> | 2019-07-05 14:08:21 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-07-05 14:08:21 +0100 |
| commit | 7f0d8e42885078583d1eab16df2523292ed1148d (patch) | |
| tree | 97d56ee3dd35549820a69b702d574d1704560773 /changelog.d/5387.bugfix | |
| parent | Assume key existence. Update docstrings (diff) | |
| parent | remove dead transaction persist code (#5622) (diff) | |
| download | synapse-7f0d8e42885078583d1eab16df2523292ed1148d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_exfiltrate_data
Diffstat (limited to 'changelog.d/5387.bugfix')
| -rw-r--r-- | changelog.d/5387.bugfix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/5387.bugfix b/changelog.d/5387.bugfix deleted file mode 100644 index 2c6c94efc4..0000000000 --- a/changelog.d/5387.bugfix +++ /dev/null @@ -1 +0,0 @@ -Warn about disabling email-based password resets when a reset occurs, and remove warning when someone attempts a phone-based reset. |