diff options
| author | Erik Johnston <erik@matrix.org> | 2015-09-15 16:35:34 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-09-15 16:35:34 +0100 |
| commit | 1107e83b5429e2465bcd52952154ba1ad01acd54 (patch) | |
| tree | 1e0af30cdf60e92faafb1cd6f903dc9c06ccd607 | |
| parent | Merge pull request #280 from matrix-org/paul/sighup (diff) | |
| parent | Bump version/changelog (diff) | |
| download | synapse-1107e83b5429e2465bcd52952154ba1ad01acd54.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
| -rw-r--r-- | CHANGES.rst | 5 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 2ec10516fd..a0a12ca4a0 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,8 @@ +Changes in synapse v0.10.0-r1 (2015-09-08) +========================================== + +* Fix bug with python packaging + Changes in synapse v0.10.0 (2015-09-03) ======================================= diff --git a/synapse/__init__.py b/synapse/__init__.py index d85bb3dce0..5b5ff6c3f3 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" +__version__ = "0.10.0-r1" |