summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-08-17 10:50:42 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-08-17 10:50:42 +0100
commitbdd201ea7f7c53bce9788bb8d5cd9a0545a76285 (patch)
tree58004f776dee6e070ca83727193bca40780baf80 /synapse/__init__.py
parentMerge pull request #5857 from matrix-org/uhoreg/fix_e2e_room_keys_index (diff)
parent1.3.1 (diff)
downloadsynapse-bdd201ea7f7c53bce9788bb8d5cd9a0545a76285.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 02ae90b072..6766ef445c 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -35,4 +35,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.3.0"
+__version__ = "1.3.1"