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

Browse Source

...

This commit is contained in:

Erik Johnston 2015-01-30 14:14:27 +00:00

parent e0b7c521cb 2aaedab203

commit f7b84eb92a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available