Erik Johnston cde840a82c Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor ... Conflicts: setup.py		2014-12-11 17:48:48 +00:00
..
api	Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor	2014-12-11 17:48:48 +00:00
app	…
config	Limit the size of images that are thumbnailed serverside. Limit the size of file that a server will download from a remote server	2014-12-11 14:19:32 +00:00
crypto	…
events	…
federation	…
handlers	…
http	…
media	…
rest	…
storage	Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor	2014-12-11 17:48:48 +00:00
streams	…
util	…
__init__.py	…
notifier.py	…
server.py	Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor	2014-12-11 17:48:48 +00:00
state.py	…
types.py	…