Merge branch 'develop' of github.com:matrix-org/synapse into erikj/atomic_join_federation

Browse Source

...

This commit is contained in:

Erik Johnston

2015-09-17 10:28:55 +01:00

parent 51b2448e05 b105996fc1

commit afe475e9be

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

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

Diff Content Not Available