Merge branch 'erikj/store_engine' into erikj/search

This commit is contained in:
Erik Johnston 2015-10-13 13:19:23 +01:00
commit f9340ea0d5
9 changed files with 464 additions and 409 deletions

View file

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