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

Conflicts:
	synapse/storage/schema/im.sql
This commit is contained in:
Erik Johnston 2015-01-30 15:16:38 +00:00
commit 1bd540ef79
19 changed files with 1166 additions and 25 deletions

View file

@ -312,7 +312,8 @@ class StateHandler(object):
except AuthError:
pass
# Oh dear.
# Use the last event (the one with the least depth) if they all fail
# the auth check.
return event
def _ordered_events(self, events):