Erik Johnston 347242a5c4 Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor ... Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py		2014-08-19 14:48:19 +01:00
..
events	Ensure we have a 'membership' key in RoomMemberEvents	2014-08-18 10:59:57 +01:00
streams	Change the way pagination works to support out of order events.	2014-08-19 14:19:48 +01:00
__init__.py	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00
auth.py	Added M_UNKNOWN_TOKEN error code and send it when there is an unrecognised access_token	2014-08-14 13:47:39 +01:00
constants.py	Use strings instead of opaque magic-number constants for presence states; rename AWAY to UNAVAILABLE	2014-08-13 14:31:48 +01:00
errors.py	Added M_UNKNOWN_TOKEN error code and send it when there is an unrecognised access_token	2014-08-14 13:47:39 +01:00
notifier.py	Correctly return new token when returning events. Serialize events correctly.	2014-08-15 15:28:54 +01:00
urls.py	Added /matrix/content path, HS resource_for_content_repo attribute and FileUploadResource. Added stub methods.	2014-08-18 17:18:54 +01:00