summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-05 16:20:48 +0000
committerErik Johnston <erik@matrix.org>2014-12-05 16:20:48 +0000
commit6630e1b5795667fd947cc5b0d5d2b00da97325e3 (patch)
treece141a61defe211cac454a5953106f6e351fe260 /synapse/server.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into events_refactor (diff)
downloadsynapse-6630e1b5795667fd947cc5b0d5d2b00da97325e3.tar.xz
Start making more things use EventContext rather than event.*
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/server.py b/synapse/server.py
index 8bc27bbc3c..0d0f3af3f4 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -20,7 +20,7 @@
 
 # Imports required for the default HomeServer() implementation
 from synapse.federation import initialize_http_replication
-from synapse.api.events import serialize_event
+from synapse.events.utils import serialize_event
 from synapse.api.events.factory import EventFactory
 from synapse.api.events.validator import EventValidator
 from synapse.notifier import Notifier