Mark Haines 14ff33bd93 Merge branch 'develop' into client_v2_sync ... Conflicts: synapse/rest/client/v2_alpha/__init__.py		2015-01-26 13:14:59 +00:00
..
api	Add client v2_alpha resource to synapse server resource tree	2015-01-23 18:55:19 +00:00
app	Add client v2_alpha resource to synapse server resource tree	2015-01-23 18:55:19 +00:00
config	Allow ':memory:' as the database path for sqlite3	2015-01-19 15:26:19 +00:00
crypto	Update copyright notices	2015-01-06 13:21:39 +00:00
events	Remove unused functions	2015-01-13 15:57:26 +00:00
federation	Finish renaming "context" to "room_id" in federation codebase	2015-01-16 19:01:03 +00:00
handlers	Replace hs.parse_roomalias with RoomAlias.from_string	2015-01-23 13:21:58 +00:00
http	Add client v2_alpha resource to synapse server resource tree	2015-01-23 18:55:19 +00:00
rest	Add client v2_alpha resource to synapse server resource tree	2015-01-23 18:55:19 +00:00
storage	Replace hs.parse_userid with UserID.from_string	2015-01-23 11:47:15 +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	Stop complaining about Synapse Angular SDK 0.6.1	2015-01-23 18:37:37 +00:00
server.py	Add client v2_alpha resource to synapse server resource tree	2015-01-23 18:55:19 +00:00
state.py	Update copyright notices	2015-01-06 13:21:39 +00:00
types.py	Update copyright notices	2015-01-06 13:21:39 +00:00