diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-08 09:43:48 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-08 09:43:48 +0000 |
| commit | 8ac9199f56b9472be450d7d605f454eccb8f2e50 (patch) | |
| tree | 1155f31341e2a6add943ae5a9e65e695d3b475b5 /VERSION | |
| parent | Log server version on startup (diff) | |
| parent | Merge branch 'hotfixes-v0.6.1' (diff) | |
| download | synapse-8ac9199f56b9472be450d7d605f454eccb8f2e50.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'VERSION')
| -rw-r--r-- | VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION index ee6cdce3c2..8b9dea59dc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.1 +0.6.1a |