diff options
author | Erik Johnston <erik@matrix.org> | 2019-09-25 17:16:28 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-09-25 17:16:28 +0100 |
commit | d2bd0bc6b188cca8c85ec34c79a70596ec0e46b1 (patch) | |
tree | 15032c3b14c0c9e3e52db8cd5fa4a04d985f034e /changelog.d/6069.bugfix | |
parent | Use if `is not None` (diff) | |
parent | Threepid validity checks on msisdns should not be dependent on 'threepid_beha... (diff) | |
download | synapse-d2bd0bc6b188cca8c85ec34c79a70596ec0e46b1.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_user_ips
Diffstat (limited to 'changelog.d/6069.bugfix')
-rw-r--r-- | changelog.d/6069.bugfix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/6069.bugfix b/changelog.d/6069.bugfix new file mode 100644 index 0000000000..a437ac41a9 --- /dev/null +++ b/changelog.d/6069.bugfix @@ -0,0 +1 @@ +Fix a bug which caused SAML attribute maps to be overridden by defaults. |