diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-11-20 10:00:13 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-11-20 10:00:13 +0000 |
| commit | b2aeaa2dcc833430330b556453acb83b23a95650 (patch) | |
| tree | 81807cc40eded2faae7bfb7f969ada5b31798642 /VERSION | |
| parent | SYN-153: Fix formatting of federation error message (diff) | |
| parent | typoe (diff) | |
| download | synapse-b2aeaa2dcc833430330b556453acb83b23a95650.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 2b7c5ae018..8f0916f768 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.2 +0.5.0 |