synapse-product/synapse
Mark Haines 357dd1871d Merge branch 'develop' into storage_transactions
Conflicts:
	tests/handlers/test_federation.py
	tests/handlers/test_room.py
2014-08-27 17:28:55 +01:00
..
api Merge branch 'develop' into storage_transactions 2014-08-27 17:15:58 +01:00
app Merge branch 'develop' into storage_transactions 2014-08-27 16:54:12 +01:00
crypto add in whitespace after copyright statements to improve legibility 2014-08-13 03:14:34 +01:00
federation Remove unused populate_previous_pdus 2014-08-27 11:34:31 +01:00
handlers Merge branch 'develop' into storage_transactions 2014-08-27 17:28:55 +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 Merge branch 'develop' of github.com:matrix-org/synapse into develop 2014-08-27 17:05:48 +01:00
storage Merge branch 'develop' into storage_transactions 2014-08-27 17:15:58 +01:00
streams Index sources in a nicer fashion. 2014-08-27 15:33:52 +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
notifier.py If timeout=0, return immediately 2014-08-27 17:21:48 +01:00
server.py Merge branch 'develop' into storage_transactions 2014-08-27 17:15:58 +01:00
state.py Start updating state handling to use snapshots 2014-08-27 15:11:51 +01:00
types.py PEP8 tweaks. 2014-08-27 14:19:39 +01:00