Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rejections_storage

This commit is contained in:
Erik Johnston 2015-01-30 14:14:27 +00:00
commit f7b84eb92a

Diff content is not available