diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-09-07 15:06:46 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-09-07 15:06:46 +0100 |
| commit | 73e4ad4b8b24bb99a8ede4bda8ac2263b68cad5e (patch) | |
| tree | 268463223a4dbed35244b83ffb7b767330f8416e /synapse/__init__.py | |
| parent | update logger to match new ambiguous script name... (diff) | |
| parent | DEPENDENCY_LINKS was turned to a list (diff) | |
| download | synapse-73e4ad4b8b24bb99a8ede4bda8ac2263b68cad5e.tar.xz | |
Merge branch 'master' into develop
Conflicts: setup.py
Diffstat (limited to 'synapse/__init__.py')
| -rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 57b8304d35..d85bb3dce0 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.10.0-rc5" +__version__ = "0.10.0" |