Mark Haines 7c06399512 Merge branch 'develop' into request_logging ... Conflicts: synapse/config/logger.py		2014-10-30 11:13:58 +00:00
..
__init__.py	fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.	2014-09-03 17:31:57 +01:00
_base.py	Fix pep8 warnings	2014-10-30 11:10:17 +00:00
captcha.py	Allow a (hidden undocumented) key to m.login.recaptcha to specify a shared secret to allow bots to bypass the ReCAPTCHA test (SYN-60)	2014-09-23 14:29:08 +01:00
database.py	Fix pep8 warnings	2014-10-30 11:10:17 +00:00
email.py	Fix pep8 warnings	2014-10-30 11:10:17 +00:00
homeserver.py	Add support for TURN servers as per the TURN REST API (http://tools.ietf.org/html/draft-uberti-behave-turn-rest-00)	2014-09-23 17:16:13 +01:00
logger.py	Fix pep8 warnings	2014-10-30 11:10:17 +00:00
ratelimiting.py	Fix pep8 warnings	2014-10-30 11:10:17 +00:00
repository.py	Fix pep8 warnings	2014-10-30 11:10:17 +00:00
server.py	Fix pep8 warnings	2014-10-30 11:10:17 +00:00
tls.py	Fix pep8 warnings	2014-10-30 11:10:17 +00:00
voip.py	Fix pep8 warnings	2014-10-30 11:10:17 +00:00