diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-11-17 12:13:14 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-11-17 12:13:14 +0000 |
| commit | d8a05418f97827fd768a1abc540b204f9120d50f (patch) | |
| tree | 6827428a35bd8d65720b1cbd5bc2ba4f25d02eae | |
| parent | Merge pull request #2686 from matrix-org/luke/as-flair (diff) | |
| parent | Merge branch 'release-v0.25.1' (diff) | |
| download | synapse-d8a05418f97827fd768a1abc540b204f9120d50f.tar.xz | |
Merge branch 'master' into develop
| -rw-r--r-- | CHANGES.rst | 8 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index a8b821a2d2..aff6688b93 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,11 @@ +Changes in synapse v0.25.1 (2017-11-17) +======================================= + +Bug fixes: + +* Fix login with LDAP and other password provider modules (PR #2678). Thanks to + @jkolo! + Changes in synapse v0.25.0 (2017-11-15) ======================================= diff --git a/synapse/__init__.py b/synapse/__init__.py index e04208961f..8c3d7a210a 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.25.0" +__version__ = "0.25.1" |