summary refs log tree commit diff
path: root/synapse/res
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-11 10:37:43 +0100
committerErik Johnston <erik@matrix.org>2019-06-11 10:37:43 +0100
commit5bc94845378aa0e8dea9bc325ac2c57aaa540ce6 (patch)
tree6bf0bb46d390ca3185fe8491ff0470d3223ab6ba /synapse/res
parentDon't warn user about password reset disabling through config code (#5387) (diff)
parent1.0.0rc3 (diff)
downloadsynapse-5bc94845378aa0e8dea9bc325ac2c57aaa540ce6.tar.xz
Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/res')
0 files changed, 0 insertions, 0 deletions