Erik Johnston 54d0a75573 Merge branch 'develop' of github.com:matrix-org/synapse into presence_logging ... Conflicts: synapse/handlers/presence.py		2014-08-28 16:52:46 +01:00
..
__init__.py	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00
async.py	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00
distributor.py	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00
jsonobject.py	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00
lockutils.py	Put some DEBUG logging in lockutils.py so we can debug roomlocks	2014-08-14 16:06:05 +01:00
logutils.py	Merge branch 'develop' of github.com:matrix-org/synapse into presence_logging	2014-08-28 16:52:46 +01:00
stringutils.py	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00