Mark Haines 4b63b06cad Merge branch 'develop' into storage_transactions ... Conflicts: synapse/api/auth.py synapse/handlers/room.py synapse/storage/__init__.py		2014-08-26 16:07:05 +01:00
..
api	Merge branch 'develop' into storage_transactions	2014-08-26 16:07:05 +01:00
app	Add the ability to turn on the twisted manhole telnet service.	2014-08-26 13:43:55 +01:00
crypto	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00
federation	Merge branch 'develop' into storage_transactions	2014-08-26 16:07:05 +01:00
handlers	Merge branch 'develop' into storage_transactions	2014-08-26 16:07:05 +01:00
http	For the content repo, don't just use homeserver.hostname as that might not include the port due to SRV.	2014-08-24 11:56:55 +01:00
rest	Fix pyflakes errors	2014-08-26 16:02:59 +01:00
storage	Merge branch 'develop' into storage_transactions	2014-08-26 16:07:05 +01:00
util	Put some DEBUG logging in lockutils.py so we can debug roomlocks	2014-08-14 16:06:05 +01:00
__init__.py	Bump versions to 0.0.1	2014-08-22 12:06:50 +01:00
server.py	Add ts field to all events.	2014-08-21 17:46:52 +01:00
state.py	Rename method name to not clash with other ones in storage.	2014-08-15 16:47:48 +01:00
types.py	Define __copy__ and __deepcopy__ as identity functions on DomainSpecificString, so that copy.deepcopy() will work on them	2014-08-20 16:06:47 +01:00