diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2019-06-06 11:10:09 +0100 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-06-06 11:10:09 +0100 |
commit | ddc219578b572ea3ec41994e163efc66a4d38f31 (patch) | |
tree | 78a0a94a19d5d3e97236fe4c8b0fd93a36968d8a /docs | |
parent | Merge branch 'anoa/hs_password_reset_sending_email' into anoa/hs_password_reset (diff) | |
download | synapse-ddc219578b572ea3ec41994e163efc66a4d38f31.tar.xz |
fix merge issue
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions