diff options
| author | Erik Johnston <erik@matrix.org> | 2015-10-15 16:37:32 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-10-15 16:37:32 +0100 |
| commit | bcfb653816bc5a12f5bb55774cc2a0913aae69dd (patch) | |
| tree | 486c983ec009886ff3ce3bfc5b6a0cf0f0445373 /synapse/app | |
| parent | Remove unused constatns (diff) | |
| parent | Merge pull request #305 from matrix-org/markjh/v2_sync_api (diff) | |
| download | synapse-bcfb653816bc5a12f5bb55774cc2a0913aae69dd.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
Diffstat (limited to 'synapse/app')
| -rwxr-xr-x | synapse/app/homeserver.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index af53acb369..cf2fa221dc 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -33,7 +33,6 @@ if __name__ == '__main__': sys.stderr.writelines(message) sys.exit(1) - from synapse.storage.engines import create_engine, IncorrectDatabaseSetup from synapse.storage import are_all_users_on_domain from synapse.storage.prepare_database import UpgradeDatabaseException |