summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-06 19:48:53 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-06 19:48:53 +0000
commit5cf45c43190321b3ee6df4198df815da29dac90f (patch)
tree9841d49b0964de4046c0835ddcc976a25c2c8137 /synapse/app
parentUse time.time() instead of time.clock() (diff)
parentMerge branch 'hotfixes-v0.6.0a' (diff)
downloadsynapse-5cf45c43190321b3ee6df4198df815da29dac90f.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/app')
-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)