summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-05-24 16:03:44 +0100
committerNeil Johnson <neil@matrix.org>2018-05-24 16:03:44 +0100
commit037c6db85dfdc629d662dfc5046f1f2df143bafc (patch)
treedba49776d8142e38ede7d42c965fbfb563478ad6 /synapse
parentMerge pull request #3261 from matrix-org/erikj/pagination_fixes (diff)
parentUpdate CHANGES.rst (diff)
downloadsynapse-037c6db85dfdc629d662dfc5046f1f2df143bafc.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 353387f154..5bada5e290 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.30.0-rc1"
+__version__ = "0.30.0"