Merge branch 'master' into develop

This commit is contained in:
Neil Johnson 2018-05-16 16:48:10 +01:00
commit 85b8acdeb4
2 changed files with 71 additions and 3 deletions

View file

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