Merge branch 'master' into daniel/insecureclient

This commit is contained in:
Daniel Wagner-Hall 2015-09-15 15:42:44 +01:00
commit 9fc0aad567
2 changed files with 6 additions and 1 deletions

View file

@ -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)
=======================================

View file

@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server.
"""
__version__ = "0.10.0"
__version__ = "0.10.0-r1"