Erik Johnston 1bd540ef79 Merge branch 'develop' of github.com:matrix-org/synapse into rejections ... Conflicts: synapse/storage/schema/im.sql		2015-01-30 15:16:38 +00:00
..
api	Merge branch 'develop' of github.com:matrix-org/synapse into rejections	2015-01-30 15:16:38 +00:00
app	Merge branch 'develop' into pushers	2015-01-28 12:51:05 +00:00
config	Allow ':memory:' as the database path for sqlite3	2015-01-19 15:26:19 +00:00
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_storage	2015-01-30 14:08:28 +00:00
federation	Fix bug where we superfluously asked for current state. Change API of /query_auth/ so that we don't duplicate events in the response.	2015-01-30 13:34:01 +00:00
handlers	Fix bug where we superfluously asked for current state. Change API of /query_auth/ so that we don't duplicate events in the response.	2015-01-30 13:34:01 +00:00
http	Merge branch 'develop' of github.com:matrix-org/synapse into rejections	2015-01-30 11:10:37 +00:00
push	Add glob asterisks when running rules.	2015-01-30 15:03:56 +00:00
rest	Add glob asterisks when running rules.	2015-01-30 15:03:56 +00:00
storage	Merge branch 'develop' of github.com:matrix-org/synapse into rejections	2015-01-30 15:16:38 +00:00
streams	Update copyright notices	2015-01-06 13:21:39 +00:00
util	Optimize FrozenEvent creation	2015-01-06 18:51:03 +00:00
__init__.py	Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse into develop	2015-01-13 10:01:22 +00:00
notifier.py	Only start the notifier timeout once we've had a chance to check for updates. Otherwise the timeout could fire while we are waiting for the database to return any updates it might have	2015-01-19 16:24:54 +00:00
python_dependencies.py	Fix bad merge fo python_dependencies.py	2015-01-30 11:14:33 +00:00
server.py	Merge changes from develop	2015-01-29 14:55:27 +00:00
state.py	Merge branch 'develop' of github.com:matrix-org/synapse into rejections	2015-01-30 15:16:38 +00:00
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