Erik Johnston 2c9e136d57 Fix bad merge fo python_dependencies.py		2015-01-30 11:14:33 +00:00
..
api	Merge branch 'develop' of github.com:matrix-org/synapse into rejections	2015-01-30 11:10:37 +00:00
app	…
config	…
crypto	Fix bug in timeout handling in keyclient	2015-01-30 11:08:01 +00:00
events	Merge branch 'develop' of github.com:matrix-org/synapse into rejections	2015-01-30 11:10:37 +00:00
federation	Fix regression where we no longer correctly handled the case of gaps in our event graph	2015-01-30 10:48:47 +00:00
handlers	Merge branch 'develop' of github.com:matrix-org/synapse into rejections	2015-01-30 11:10:37 +00:00
http	Merge branch 'develop' of github.com:matrix-org/synapse into rejections	2015-01-30 11:10:37 +00:00
push	Include content in notification pokes	2015-01-29 21:59:17 +00:00
rest	Renumber priority classes so we can use 0 for defaults.	2015-01-29 17:12:11 +00:00
storage	Merge branch 'develop' of github.com:matrix-org/synapse into rejections	2015-01-30 11:10:37 +00:00
streams	…
util	…
__init__.py	…
notifier.py	…
python_dependencies.py	Fix bad merge fo python_dependencies.py	2015-01-30 11:14:33 +00:00
server.py	…
state.py	…
types.py	Rename ClientID to ClientInfo since it is a pair of IDs rather than a single identifier	2015-01-28 17:16:12 +00:00