Mark Haines 4ad8b45155 Merge branch 'develop' into key_distribution ... Conflicts: synapse/config/homeserver.py		2015-04-29 13:15:14 +01:00
..
__init__.py	…
_base.py	Merge branch 'develop' into key_distribution	2015-04-29 13:15:14 +01:00
appservice.py	Add AppServiceConfig	2015-03-31 09:22:31 +01:00
captcha.py	New registration for C/S API v2. Only ReCAPTCHA working currently.	2015-03-30 18:13:10 +01:00
database.py	Move database configuration into config module	2015-04-27 15:57:43 +01:00
homeserver.py	Merge branch 'develop' into key_distribution	2015-04-29 13:15:14 +01:00
key.py	Add config for setting the perspective servers	2015-04-24 17:01:34 +01:00
logger.py	Delete ugly commented out log line.	2015-04-29 11:07:13 +01:00
metrics.py	…
ratelimiting.py	…
registration.py	Fix spelling	2015-04-24 11:29:19 +01:00
repository.py	…
server.py	Move the key related config parser into a separate file	2015-04-24 10:22:22 +01:00
tls.py	…
voip.py	…