summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-13 14:32:17 +0000
committerErik Johnston <erik@matrix.org>2015-02-13 14:32:17 +0000
commit2aa87305c02b2d75a2a6a1893782127ae9e328f8 (patch)
tree4f52989565dcfa53d184b28064bcc919bcbf6a4b /synapse/__init__.py
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentpyflakes (diff)
downloadsynapse-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 'synapse/__init__.py')
0 files changed, 0 insertions, 0 deletions