diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-01 13:42:50 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-08-01 13:42:50 +0100 |
| commit | 303f1c851fc363d3fc4fc4c91328abd89863341d (patch) | |
| tree | e8d8c1ba55141f3eae7aa8ea74a509e3dac42e28 /changelog.d/3626.bugfix | |
| parent | fix known broken test (diff) | |
| parent | Merge pull request #3543 from bebehei/docker (diff) | |
| download | synapse-303f1c851fc363d3fc4fc4c91328abd89863341d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_in_log_in_limits
Diffstat (limited to 'changelog.d/3626.bugfix')
| -rw-r--r-- | changelog.d/3626.bugfix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/3626.bugfix b/changelog.d/3626.bugfix new file mode 100644 index 0000000000..9a4b878986 --- /dev/null +++ b/changelog.d/3626.bugfix @@ -0,0 +1 @@ +Only import secrets when available (fix for py < 3.6) |