Mark Haines 73e4ad4b8b Merge branch 'master' into develop ... Conflicts: setup.py		2015-09-07 15:06:46 +01:00
..
__init__.py	…
__main__.py	Fix typo when using sys.stderr.write	2015-08-25 15:39:16 +01:00
_base.py	Lists use 'append'	2015-09-02 17:27:59 +01:00
appservice.py	…
captcha.py	…
database.py	…
homeserver.py	…
key.py	Fix typo in module imports and package dependencies	2015-08-25 10:42:59 +01:00
logger.py	…
metrics.py	Add backwards compat support for metrics, manhole and webclient config options	2015-06-12 17:44:23 +01:00
ratelimiting.py	…
registration.py	Issue macaroons as opaque auth tokens	2015-08-18 14:22:02 +01:00
repository.py	Fix flake8 warning	2015-08-13 17:34:22 +01:00
saml2.py	…
server.py	Allow specifying a directory to host a web client from	2015-08-25 12:01:23 +01:00
tls.py	Merge branch 'master' of github.com:matrix-org/synapse into develop	2015-07-21 09:25:30 +01:00
voip.py	…