diff options
author | Erik Johnston <erik@matrix.org> | 2014-12-19 16:37:08 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-12-19 16:37:08 +0000 |
commit | d61109f5781fecfdc8b3ea1f1ae74a72f8a2a913 (patch) | |
tree | dff914dc74740d36be1da73be66a8b06c6c4feea /setup.py | |
parent | Merge branch 'release-v0.6.0' of github.com:matrix-org/synapse into erikj-perf (diff) | |
parent | Set a state_key for the topic and room name, otherwise they won't be treated ... (diff) | |
download | synapse-d61109f5781fecfdc8b3ea1f1ae74a72f8a2a913.tar.xz |
Merge branch 'hotfixes-v0.6.0' of github.com:matrix-org/synapse into erikj-perf
Diffstat (limited to 'setup.py')
-rwxr-xr-x | setup.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/setup.py b/setup.py |