summary refs log tree commit diff
path: root/VERSION
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-03-09 13:29:41 +0000
committerErik Johnston <erik@matrix.org>2015-03-09 13:29:41 +0000
commitf31e65ca8b3a056b81c9ee1c8e5be298e36ed495 (patch)
tree414d6a488f090cea0aff41ef8ca7346f47567a62 /VERSION
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj-perf (diff)
parentD'oh: underscore, not hyphen (diff)
downloadsynapse-f31e65ca8b3a056b81c9ee1c8e5be298e36ed495.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf
Diffstat (limited to 'VERSION')
-rw-r--r--VERSION1
1 files changed, 0 insertions, 1 deletions
diff --git a/VERSION b/VERSION
deleted file mode 100644
index 3b3e723172..0000000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.6.1b