Erik Johnston d72f897f07 Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor ... Conflicts: synapse/storage/stream.py		2014-08-15 11:50:14 +01:00
..
api	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor	2014-08-15 11:50:14 +01:00
app	Change relative db paths to absolute paths in case we daemonize.	2014-08-14 14:08:57 +01:00
crypto	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00
federation	Added a urls module for keeping client and federation prefixes.	2014-08-14 11:52:56 +01:00
handlers	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor	2014-08-15 11:50:14 +01:00
http	If the web client is enabled, automatically redirect root '/' to the web client path.	2014-08-14 11:37:13 +01:00
rest	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor	2014-08-15 11:50:14 +01:00
storage	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor	2014-08-15 11:50:14 +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	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00
server.py	Removed http_server from HomeServer. Updated unit tests to use either resource_for_federation or resource_for_client depending on what is being tested.	2014-08-14 10:18:54 +01:00
state.py	Add a check to make sure that during state conflict res we only request a PDU we don't have.	2014-08-15 11:47:01 +01:00
types.py	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00