Merge remote-tracking branch 'origin/develop' into hawkowl/userdir-search

This commit is contained in:
Amber Brown 2019-03-11 21:12:30 +11:00
commit 30a8deeb68
8 changed files with 57 additions and 19 deletions

View file

@ -115,6 +115,7 @@ def default_config(name):
config.signing_key = [MockKey()]
config.event_cache_size = 1
config.enable_registration = True
config.enable_registration_captcha = False
config.macaroon_secret_key = "not even a little secret"
config.expire_access_token = False
config.server_name = name