diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-12-15 11:19:30 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-12-15 11:19:30 +0000 |
| commit | 0aa8c0847876074b7985f7a5de73ff1d36af0e1a (patch) | |
| tree | 8d1ac270bf3d0c91b2c0644544444493e53021c0 /synapse | |
| parent | Send list of typing user IDs as 'user_ids' list within 'content', so that m.t... (diff) | |
| parent | Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-0aa8c0847876074b7985f7a5de73ff1d36af0e1a.tar.xz | |
Merge branch 'develop' into typing_notifications
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/config/_base.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 723e15d506..7e49e1fd08 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a synapse home server. """ -__version__ = "0.5.4" +__version__ = "0.5.4a" diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1426436dcb..1cdd03e414 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -44,9 +44,9 @@ class Config(object): ) if not os.path.exists(file_path): raise ConfigError( - "File % config for %s doesn't exist." + "File %s config for %s doesn't exist." " Try running again with --generate-config" - % (config_name,) + % (file_path, config_name,) ) return cls.abspath(file_path) |