diff options
author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 16:59:41 +0100 |
---|---|---|
committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 16:59:41 +0100 |
commit | 4e706ec82c87ec57feac05c87417072106d17154 (patch) | |
tree | 0e52c64183fef1d35f904304e302840ad9aac5e9 | |
parent | Merge branch 'develop' into auth (diff) | |
parent | Merge pull request #239 from matrix-org/pynacl (diff) | |
download | synapse-4e706ec82c87ec57feac05c87417072106d17154.tar.xz |
Merge branch 'develop' into auth
-rw-r--r-- | synapse/python_dependencies.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py |