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

Remove unused import

2015-01-07 09:48:03 +00:00

builder.py

Remove unused functions

2015-01-13 15:57:26 +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

Pass the current time to serialize event, rather than passing an

2015-01-26 16:11:28 +00:00

validator.py

Update copyright notices

2015-01-06 13:21:39 +00:00