Mark Haines 7c06399512 Merge branch 'develop' into request_logging ... Conflicts: synapse/config/logger.py		2014-10-30 11:13:58 +00:00
..
api	Fix pep8 warnings	2014-10-30 11:10:17 +00:00
app	Merge branch 'develop' into request_logging	2014-10-30 11:13:58 +00:00
config	Merge branch 'develop' into request_logging	2014-10-30 11:13:58 +00:00
crypto	Merge branch 'develop' into request_logging	2014-10-30 11:13:58 +00:00
federation	Check that we have auth headers and fail nicely	2014-10-17 21:00:58 +01:00
handlers	Fix pep8 warnings	2014-10-30 11:10:17 +00:00
http	Merge branch 'develop' into request_logging	2014-10-30 11:13:58 +00:00
rest	Fix pep8 warnings	2014-10-30 11:10:17 +00:00
storage	Merge branch 'develop' into request_logging	2014-10-30 11:13:58 +00:00
streams	Construct a source-specific 'SourcePaginationConfig' to pass into get_pagination_rows; meaning each source doesn't have to care about its own name any more	2014-10-29 16:16:01 +00:00
util	Merge branch 'develop' into request_logging	2014-10-30 11:13:58 +00:00
__init__.py	Bump the other version	2014-10-18 00:29:55 +02:00
notifier.py	Fix pep8 warnings	2014-10-30 11:10:17 +00:00
server.py	Merge branch 'develop' into server2server_signing	2014-09-30 17:55:06 +01:00
state.py	Make the state resolution use actual power levels rather than taking them from a Pdu key.	2014-09-12 17:11:09 +01:00
types.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