diff options
author | Erik Johnston <erik@matrix.org> | 2016-02-11 16:03:47 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-02-11 16:04:15 +0000 |
commit | 2a24f906a9a7e29e0744ad89cb2de5328c5f3987 (patch) | |
tree | 3baa10fc7a3c447e910a9d8f03fbdda238ab08dc | |
parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
download | synapse-2a24f906a9a7e29e0744ad89cb2de5328c5f3987.tar.xz |
Bump version and changelog
-rw-r--r-- | CHANGES.rst | 5 | ||||
-rw-r--r-- | synapse/__init__.py | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst |