summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-07 09:40:42 +0000
committerErik Johnston <erik@matrix.org>2015-01-07 09:40:42 +0000
commit1497e50649f2b3a7a4b7e119fd3cb85a22f87e92 (patch)
tree6e24afc0c9f112674e26662e470a178e60c955c4 /synapse/app/homeserver.py
parentOptimize FrozenEvent creation (diff)
parentMerge branch 'master' into develop (diff)
downloadsynapse-1497e50649f2b3a7a4b7e119fd3cb85a22f87e92.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf
Diffstat (limited to 'synapse/app/homeserver.py')
-rwxr-xr-xsynapse/app/homeserver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index f8484f1a3b..5fec8da7ca 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -234,7 +234,7 @@ def setup():
     except UpgradeDatabaseException:
         sys.stderr.write(
             "\nFailed to upgrade database.\n"
-            "Have you followed any instructions in UPGRADES.rst?\n"
+            "Have you checked for version specific instructions in UPGRADES.rst?\n"
         )
         sys.exit(1)