diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-09-24 17:03:50 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-09-24 17:03:50 +0100 |
| commit | 9b7c4f40782b09000141d7311fc39d387336350a (patch) | |
| tree | 0c64c6ace7581c2f4e83c6b79159a11d35fc20e1 /changelog.d | |
| parent | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work (diff) | |
| parent | remove unused parameter to get_user_id_by_threepid (#6099) (diff) | |
| download | synapse-9b7c4f40782b09000141d7311fc39d387336350a.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/6069.bugfix | 1 | ||||
| -rw-r--r-- | changelog.d/6097.bugfix | 1 | ||||
| -rw-r--r-- | changelog.d/6099.misc | 1 |
3 files changed, 3 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. diff --git a/changelog.d/6097.bugfix b/changelog.d/6097.bugfix new file mode 100644 index 0000000000..750a8ecf0a --- /dev/null +++ b/changelog.d/6097.bugfix @@ -0,0 +1 @@ +Add sid to next_link for email validation. diff --git a/changelog.d/6099.misc b/changelog.d/6099.misc new file mode 100644 index 0000000000..8415c6759b --- /dev/null +++ b/changelog.d/6099.misc @@ -0,0 +1 @@ +Remove unused parameter to get_user_id_by_threepid. |