Erik Johnston 5aa024e501 Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader		2016-07-29 11:24:56 +01:00
..
slave	…
__init__.py	…
presence_resource.py	…
pusher_resource.py	…
resource.py	…