Merge branch 'master' into develop

This commit is contained in:
Neil Johnson 2018-05-24 16:03:44 +01:00
commit 037c6db85d
2 changed files with 25 additions and 6 deletions

View file

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