MatrixSynapse/synapse/rest/client
Daniel Wagner-Hall 7e90fb6a57 Merge branch 'develop' into daniel/roomcleanupincremental
Conflicts:
	synapse/rest/client/v1/room.py
2016-02-17 15:53:59 +00:00
..
v1 Merge branch 'develop' into daniel/roomcleanupincremental 2016-02-17 15:53:59 +00:00
v2_alpha Catch the exceptions thrown by twisted when you write to a closed connection 2016-02-12 13:46:59 +00:00
__init__.py copyrights 2016-01-07 04:26:29 +00:00
versions.py Fix flake8 warnings for new flake8 2016-02-02 17:18:50 +00:00