Merge branch 'auth' into refresh

Conflicts: synapse/handlers/register.py
2015-08-20 17:13:33 +01:00 · 2015-08-20 17:13:33 +01:00 · d5a825edee
parent e8cf77fa49 225c244aba
commit d5a825edee
2 changed files with 4 additions and 4 deletions
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@ -24,7 +24,7 @@ REQUIREMENTS = {
    "pyopenssl>=0.14": ["OpenSSL>=0.14"],
    "pyyaml": ["yaml"],
    "pyasn1": ["pyasn1"],
-    "pynacl>=0.0.3": ["nacl>=0.0.3"],
+    "pynacl>=0.3.0": ["nacl>=0.3.0"],
    "daemonize": ["daemonize"],
    "py-bcrypt": ["bcrypt"],
    "frozendict>=0.4": ["frozendict"],