diff options
| author | Abhilash Raj | 2015-04-20 15:16:15 +0530 |
|---|---|---|
| committer | Abhilash Raj | 2015-04-20 15:16:15 +0530 |
| commit | 58ea970fa0f9064ae052d2b9ae1371ef00bd23e6 (patch) | |
| tree | 4d21000f8ad772377a655ff332288b1c753f5be1 /src/mailman/app/registrar.py | |
| parent | ec053e7682b14181147d0b7bedb1e5b19a46b56b (diff) | |
| parent | 3eb81bf5078868b0fc44f991b0b4536a2a3f4b47 (diff) | |
| download | mailman-58ea970fa0f9064ae052d2b9ae1371ef00bd23e6.tar.gz mailman-58ea970fa0f9064ae052d2b9ae1371ef00bd23e6.tar.zst mailman-58ea970fa0f9064ae052d2b9ae1371ef00bd23e6.zip | |
merge trunk and fix merge conflicts
Diffstat (limited to '')
| -rw-r--r-- | src/mailman/app/registrar.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mailman/app/registrar.py b/src/mailman/app/registrar.py index ae4322d22..240742bc0 100644 --- a/src/mailman/app/registrar.py +++ b/src/mailman/app/registrar.py @@ -63,7 +63,7 @@ class Registrar: pre_confirmed=pre_confirmed, pre_approved=pre_approved) list(workflow) - return workflow.token + return workflow.token, workflow.token_owner, workflow.member def confirm(self, token): """See `IRegistrar`.""" @@ -71,7 +71,7 @@ class Registrar: workflow.token = token workflow.restore() list(workflow) - return workflow.token + return workflow.token, workflow.token_owner, workflow.member def discard(self, token): """See `IRegistrar`.""" |