diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-14 10:01:04 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-14 10:01:04 +0100 |
| commit | 10294b60824347d73b01f7ce4add18467d1e6f0c (patch) | |
| tree | 06d04a0a2e0ccf183bfc602ce9694d5958ed7a2e /synapse/api/auth.py | |
| parent | Make feedback table also store sender. (diff) | |
| parent | grammar fix (diff) | |
| download | synapse-10294b60824347d73b01f7ce4add18467d1e6f0c.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts: synapse/storage/_base.py
Diffstat (limited to 'synapse/api/auth.py')
| -rw-r--r-- | synapse/api/auth.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index 84bc0398fd..8d2ba242e1 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -14,6 +14,7 @@ # limitations under the License. """This module contains classes for authenticating the user.""" + from twisted.internet import defer from synapse.api.constants import Membership |