summary refs log tree commit diff
path: root/VERSION
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-25 18:21:42 +0100
committerErik Johnston <erik@matrix.org>2014-09-25 18:21:42 +0100
commit7a8307fe7c3f6b13c78681f1eb320149238828ca (patch)
tree8693ec59f906c076abb534f01c32573619bf7c8c /VERSION
parentAdd realm to coturn options (it needs it). (diff)
parentMerge branch 'release-v0.3.4' of github.com:matrix-org/synapse (diff)
downloadsynapse-7a8307fe7c3f6b13c78681f1eb320149238828ca.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'VERSION')
-rw-r--r--VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION
index 1c09c74e22..42045acae2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.3.3
+0.3.4