Merge branch 'master' into develop

This commit is contained in:
Neil Johnson 2018-06-08 15:47:11 +01:00
commit ed5a0780a4
2 changed files with 13 additions and 1 deletions

View file

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