David Baker b56730bb6e Merge branch 'develop' into pushers ...

Conflicts:
	synapse/api/errors.py
	synapse/server.py
	synapse/storage/__init__.py

2014-12-18 15:15:22 +00:00

..

__init__.py

Fix pep8 warnings

2014-10-30 11:10:17 +00:00

auth.py

Make auth module use EventTypes constants

2014-12-12 16:31:50 +00:00

constants.py

Kill off synapse.api.events.*

2014-12-16 11:29:05 +00:00

errors.py

Merge branch 'develop' into pushers

2014-12-18 15:15:22 +00:00

ratelimiting.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

urls.py

Get uploads working with new media repo

2014-12-02 19:51:47 +00:00