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 /synapse/__init__.py | |
| 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 'synapse/__init__.py')
| -rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 895a0766d2..012425fa60 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.6.1b" +__version__ = "0.6.1d" |