Merge branch 'erikj/store_engine' into erikj/search

This commit is contained in:
Erik Johnston 2015-10-13 13:57:06 +01:00
commit 88971fd034
6 changed files with 5 additions and 5 deletions

View file

@ -14,7 +14,7 @@
import logging
from synapse.storage.schema_prepare import get_statements
from synapse.storage.prepare_database import get_statements
from synapse.storage.engines import PostgresEngine, Sqlite3Engine
import ujson