Mark Haines 2d4d2bbae4 Merge branch 'develop' into markjh/config_cleanup ... Conflicts: synapse/config/captcha.py		2015-04-30 16:54:55 +01:00
..
__init__.py	Update copyright notices	2015-01-06 13:21:39 +00:00
homeserver.py	Merge branch 'develop' into markjh/config_cleanup	2015-04-30 16:54:55 +01:00
synctl.py	Don't write bytecode	2015-02-17 10:54:06 +00:00