Erik Johnston bb4a20174c Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization ... Conflicts: synapse/federation/transport.py synapse/handlers/message.py		2014-10-27 10:20:44 +00:00
..
__init__.py	Don't strip out null's in serialized events, as that is not need anymore and it's not in the spec (yet)	2014-09-25 17:00:17 +01:00
factory.py	Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization	2014-10-27 10:20:44 +00:00
room.py	Rename deletions to redactions	2014-09-24 15:27:59 +01:00
utils.py	Rename deletions to redactions	2014-09-24 15:27:59 +01:00