diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-02-02 14:05:42 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-02-02 14:05:42 +0000 |
| commit | 6e856d772989efe3fabc49f84f966c6407071698 (patch) | |
| tree | d4cce2877b6b579e828a4a3cb22e91a4ab2dd05c /VERSION | |
| parent | Ignore empty strings for display names & room names in notifications (diff) | |
| parent | fix OSX stuff and typos (diff) | |
| download | synapse-6e856d772989efe3fabc49f84f966c6407071698.tar.xz | |
Merge master into develop
Conflicts: README.rst setup.py
Diffstat (limited to 'VERSION')
| -rw-r--r-- | VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION index 3b3e723172..1c29ff4d36 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.1b +0.6.1d |