diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-22 13:35:34 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-22 13:35:34 +0000 |
| commit | 7f058c5ff743e2cf563b9aa5436ee9801a14e633 (patch) | |
| tree | 8ef0270ede93c304b0859c4e8fba49b9581b2514 /synapse/__init__.py | |
| parent | Add twisted Service interface (diff) | |
| parent | Move experiments, graph and cmdclient into contrib (diff) | |
| download | synapse-7f058c5ff743e2cf563b9aa5436ee9801a14e633.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf
Conflicts: synapse/app/homeserver.py
Diffstat (limited to 'synapse/__init__.py')
| -rw-r--r-- | synapse/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 06167e3c1a..895a0766d2 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -""" This is a reference implementation of a synapse home server. +""" This is a reference implementation of a Matrix home server. """ -__version__ = "0.6.0" +__version__ = "0.6.1b" |