Mark Haines fa9d36e050 Merge branch 'develop' into markjh/direct_to_device_federation		2016-09-08 13:43:43 +01:00
..
slave	Merge branch 'develop' into markjh/direct_to_device_federation	2016-09-08 13:43:43 +01:00
__init__.py	Add a /replication API for extracting the updates that happened on	2016-03-01 14:49:41 +00:00
presence_resource.py	Allow external processes to mark a user as syncing. (#812)	2016-06-02 15:20:15 +01:00
pusher_resource.py	Report per request metrics for all of the things using request_handler	2016-04-28 10:57:49 +01:00
resource.py	Merge pull request #1060 from matrix-org/erikj/state_ids	2016-09-01 14:20:42 +01:00