Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Mark Haines 2015-12-07 13:13:43 +00:00
commit d547afeae0
4 changed files with 30 additions and 2 deletions

View file

@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server.
"""
__version__ = "0.11.0-r2"
__version__ = "0.11.1"