Erik Johnston e0b7c521cb Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage ... Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql		2015-01-30 14:08:28 +00:00
..
__init__.py	…
builder.py	…
snapshot.py	…
utils.py	Pass the current time to serialize event, rather than passing an	2015-01-26 16:11:28 +00:00
validator.py	…