Mark Haines 62607d5452 Merge branch 'develop' into markjh/split_out_site.py ...

Conflicts:
	synapse/app/homeserver.py

2016-04-22 16:26:57 +01:00

..

__init__.py

Fix flake8 warnings for new flake8

2016-02-02 17:18:50 +00:00

homeserver.py

Merge branch 'develop' into markjh/split_out_site.py

2016-04-22 16:26:57 +01:00

pusher.py

Optionally split out the pushers into a separate process

2016-04-21 17:22:37 +01:00

synctl.py

Use syntax that works on both py2.7 and py3

2016-03-07 20:13:10 +00:00