Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-08 17:22:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Erik Johnston 2014-08-26 16:03:56 +01:00
commit 3df5cb804f
11 changed files with 11 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
synapse/api/auth.py
View file

@ -19,8 +19,7 @@ from twisted.internet import defer
from synapse.api.constants import Membership
from synapse.api.errors import AuthError, StoreError, Codes
from synapse.api.events.room import (RoomTopicEvent, RoomMemberEvent,
MessageEvent, FeedbackEvent)
from synapse.api.events.room import RoomMemberEvent
import logging

3
synapse/api/streams/event.py
View file

@ -19,9 +19,6 @@ from twisted.internet import defer
from synapse.api.errors import EventStreamError
from synapse.api.events import SynapseEvent
from synapse.api.events.room import (
RoomMemberEvent, MessageEvent, FeedbackEvent, RoomTopicEvent
)
from synapse.api.streams import PaginationStream, StreamData
import logging