diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-10-27 16:56:08 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-10-27 16:56:08 +0000 |
| commit | 7c7d9d632669fd7c3456096c504126dfc55b1235 (patch) | |
| tree | 2e6384548bb98a4ce84676c3fb560d4f71438699 /synapse | |
| parent | fix pyflakes warnings (diff) | |
| parent | Remove duplicate join_event from create_room (diff) | |
| download | synapse-7c7d9d632669fd7c3456096c504126dfc55b1235.tar.xz | |
Merge branch 'develop' into event_signing
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/room.py | 5 | ||||
| -rw-r--r-- | synapse/test_pyflakes.py | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index c0f9a7c807..21ae03df0d 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -169,11 +169,6 @@ class RoomCreationHandler(BaseHandler): content=content ) - yield self.hs.get_handlers().room_member_handler.change_membership( - join_event, - do_auth=False - ) - content = {"membership": Membership.INVITE} for invitee in invite_list: invite_event = self.event_factory.create_event( diff --git a/synapse/test_pyflakes.py b/synapse/test_pyflakes.py deleted file mode 100644 index 7b5b1a0858..0000000000 --- a/synapse/test_pyflakes.py +++ /dev/null @@ -1 +0,0 @@ -import an_unused_module |