From 49948d72f3c76f0ca32b844955d3add7922180ea Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 7 Nov 2014 10:42:44 +0000
Subject: Fix joining over federation

---
 synapse/storage/__init__.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'synapse/storage/__init__.py')

diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 48ad4d864f..96adf20c89 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -310,6 +310,7 @@ class DataStore(RoomMemberStore, RoomStore,
                     "room_id": event.room_id,
                     "auth_id": auth_id,
                 },
+                or_ignore=True,
             )
 
         (ref_alg, ref_hash_bytes) = compute_event_reference_hash(event)
-- 
cgit 1.4.1