Merge branch 'develop' into storage_transactions

Conflicts:
	tests/handlers/test_federation.py
	tests/handlers/test_room.py
This commit is contained in:
Mark Haines 2014-08-27 17:28:55 +01:00
commit 357dd1871d
5 changed files with 11 additions and 7 deletions

View file

@ -44,7 +44,7 @@ class BaseRoomHandler(BaseHandler):
)))
event.destinations = list(destinations)
self.notifier.on_new_room_event(event, extra_users=[])
self.notifier.on_new_room_event(event, extra_users=extra_users)
federation_handler = self.hs.get_handlers().federation_handler
yield federation_handler.handle_new_event(event, snapshot)