diff options
author | Erik Johnston <erik@matrix.org> | 2014-10-20 17:53:18 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-10-20 17:53:18 +0100 |
commit | 4ae0844ee3128cf4cfdcaf87216ba69f8eb1bf5d (patch) | |
tree | 4c40d64dcf344cbfe021d3349e83d2e236f4c49f /setup.py | |
parent | more timestamp fixes (diff) | |
parent | use a tagged version of syutil rather than master (diff) | |
download | synapse-4ae0844ee3128cf4cfdcaf87216ba69f8eb1bf5d.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'setup.py')
-rwxr-xr-x | setup.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/setup.py b/setup.py |