diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2019-03-12 17:15:21 +0000 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2019-03-12 17:15:21 +0000 |
| commit | 332b60ec68f3f5ddc5d25326b5fbe3a69f27f23b (patch) | |
| tree | b8a691915768113d341b6c53665e49f23c1800a0 /synapse/config/captcha.py | |
| parent | Transfer local user's push rules on room upgrade (#4838) (diff) | |
| parent | fix orphaned sentence (diff) | |
| download | synapse-332b60ec68f3f5ddc5d25326b5fbe3a69f27f23b.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/config/captcha.py')
0 files changed, 0 insertions, 0 deletions