diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-03 09:46:39 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-03 09:46:39 +0100 |
| commit | ddc16d8642b92972b9bfb7d47d2a0f415fd326bf (patch) | |
| tree | 5a29e291a75dd1b33299b2269850dc9e16ac6fca /VERSION | |
| parent | Add ban support: /rooms/$roomid/ban with { user_id : foo } (diff) | |
| parent | Add database upgrade script (diff) | |
| download | synapse-ddc16d8642b92972b9bfb7d47d2a0f415fd326bf.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 d917d3e26a..0ea3a944b3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.2 +0.2.0 |