Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-11-25 07:44:22 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into storage_transactions

Browse source 
Conflicts:
	synapse/api/auth.py
	synapse/handlers/room.py
	synapse/storage/__init__.py
This commit is contained in:
Mark Haines 2014-08-26 16:07:05 +01:00
commit 4b63b06cad
74 changed files with 3467 additions and 870 deletions
Download patch file Download diff file Expand all files Collapse all files

2
synapse/storage/room.py
View file

@ -18,12 +18,10 @@ from twisted.internet import defer
from sqlite3 import IntegrityError
from synapse.api.errors import StoreError
from synapse.api.events.room import RoomTopicEvent
from ._base import SQLBaseStore, Table
import collections
import json
import logging
logger = logging.getLogger(__name__)