diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-12-16 11:18:45 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-12-16 11:18:45 +0000 |
| commit | 4fab578b434814cd283fe77bb62b2b8a771aac92 (patch) | |
| tree | 08720e856f92728987fc56a18c67b46ed3667ea6 /synapse/__init__.py | |
| parent | Merge pull request #443 from matrix-org/markjh/commentary (diff) | |
| parent | Merge pull request #445 from matrix-org/markjh/rebind_threepid (diff) | |
| download | synapse-4fab578b434814cd283fe77bb62b2b8a771aac92.tar.xz | |
Merge branch 'release-v0.12.0' into develop
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 c357f8f9c2..e07c26ccd0 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.12.0-rc1" +__version__ = "0.12.0-rc2" |