Merge branch 'master' into develop

This commit is contained in:
Mark Haines 2016-06-23 11:17:48 +01:00
commit 05f1a4596a
2 changed files with 156 additions and 31 deletions

View file

@ -27,6 +27,7 @@ class CaptchaConfig(Config):
def default_config(self, **kwargs):
return """\
## Captcha ##
# See docs/CAPTCHA_SETUP for full details of configuring this.
# This Home Server's ReCAPTCHA public key.
recaptcha_public_key: "YOUR_PUBLIC_KEY"