diff options
| author | Half-Shot <will@half-shot.uk> | 2019-08-23 09:55:57 +0100 |
|---|---|---|
| committer | Half-Shot <will@half-shot.uk> | 2019-08-23 09:55:57 +0100 |
| commit | ffa5b757c7775b1fffa4b2d998407be61369ce7f (patch) | |
| tree | b332966f46b979b9e068b6547768ae20378366cf /synapse | |
| parent | Fix registration test (diff) | |
| parent | Add changelog (diff) | |
| download | synapse-ffa5b757c7775b1fffa4b2d998407be61369ce7f.tar.xz | |
Merge branch 'hs/bot-user-type' into hs/exempt-support-users-from-consent
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/api/constants.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py |