Erik Johnston 2ebf795c0a Merge branch 'develop' of github.com:matrix-org/synapse into rejections ... Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql		2015-01-30 11:10:37 +00:00
..
__init__.py	Fix bug where we changes in outlier in metadata dict propogated to other events	2015-01-30 10:30:54 +00:00
builder.py	Fix bug where we changes in outlier in metadata dict propogated to other events	2015-01-30 10:30:54 +00:00
snapshot.py	Add support for storing rejected events in EventContext and data stores	2015-01-22 15:50:17 +00:00
utils.py	Merge branch 'develop' of github.com:matrix-org/synapse into rejections	2015-01-30 11:10:37 +00:00
validator.py	Update copyright notices	2015-01-06 13:21:39 +00:00