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
presence_resource.py	Allow external processes to mark a user as syncing. (#812)	2016-06-02 15:20:15 +01:00
pusher_resource.py
resource.py	Merge pull request #1060 from matrix-org/erikj/state_ids	2016-09-01 14:20:42 +01:00