diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-04 07:38:38 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-04 07:38:38 +0100 |
| commit | 9f633bc1252ceb98999fb74c56cc3e3914067743 (patch) | |
| tree | c0bbbd3a7718508571bc0eb3b3500a369cbd2d5b /synapse | |
| parent | big warning (diff) | |
| parent | make synctl default to homesever.log (diff) | |
| download | synapse-9f633bc1252ceb98999fb74c56cc3e3914067743.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Conflicts: CHANGES.rst
Diffstat (limited to 'synapse')
| -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 564d789645..440e633966 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a synapse home server. """ -__version__ = "0.2.0" +__version__ = "0.2.1" |