diff options
author | Erik Johnston <erik@matrix.org> | 2015-05-06 12:54:36 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-05-06 12:54:36 +0100 |
commit | f10fd8a4700633cc70a03ce45a7e29943c09dc90 (patch) | |
tree | 3d1b4a555da34c6302b1be379efc0eb8121841cb /setup.py | |
parent | Update change log (diff) | |
parent | Merge pull request #140 from matrix-org/erikj/scripts_refactor (diff) | |
download | synapse-f10fd8a4700633cc70a03ce45a7e29943c09dc90.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.9.0
Diffstat (limited to 'setup.py')
-rwxr-xr-x | setup.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/setup.py b/setup.py |