diff options
author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-26 13:45:06 +0100 |
---|---|---|
committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-26 13:45:06 +0100 |
commit | 37f0ddca5fd932e091449f68b44428597dc8a309 (patch) | |
tree | ecd7714e4979d723d4cafe71623223a0e5ad5fd2 /synapse/storage/registration.py | |
parent | Attempt to validate macaroons (diff) | |
parent | Merge erikj/user_dedup to develop (diff) | |
download | synapse-37f0ddca5fd932e091449f68b44428597dc8a309.tar.xz |
Merge branch 'mergeeriksmadness' into auth
Diffstat (limited to 'synapse/storage/registration.py')
-rw-r--r-- | synapse/storage/registration.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py |