diff options
author | Erik Johnston <erik@matrix.org> | 2016-06-16 10:40:17 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-06-16 10:40:17 +0100 |
commit | 2b0f9bddcf7078a439cd89b35556b24a1890e87f (patch) | |
tree | 6da4047c2b9b6f1c57435e668c3d5814d56e1b41 /synapse/storage/registration.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/paginate_sync (diff) | |
parent | Merge pull request #873 from vt0r/bugfix/bcrypt-utf8-encode (diff) | |
download | synapse-2b0f9bddcf7078a439cd89b35556b24a1890e87f.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/paginate_sync
Diffstat (limited to 'synapse/storage/registration.py')
0 files changed, 0 insertions, 0 deletions