diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-13 14:32:17 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-13 14:32:17 +0000 |
| commit | 2aa87305c02b2d75a2a6a1893782127ae9e328f8 (patch) | |
| tree | 4f52989565dcfa53d184b28064bcc919bcbf6a4b /synapse/__init__.py | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| parent | pyflakes (diff) | |
| download | synapse-2aa87305c02b2d75a2a6a1893782127ae9e328f8.tar.xz | |
Merge pull request #71 from matrix-org/auth-conflict-res
When we see a difference in current state, actually use state conflict resolution algorithm
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions