diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-01-04 14:02:50 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-01-04 14:02:50 +0000 |
| commit | f35f8d06ea58e2d0cdccd82924c7a44fd93f4c38 (patch) | |
| tree | dc5312558565f8ac01264be21d388e563a5c8c58 /synapse/storage/registration.py | |
| parent | Added info abou Martin Giess' auto-deployment process with vagrant/ansible (diff) | |
| parent | Bump changelog and version for v0.12.0 (diff) | |
| download | synapse-f35f8d06ea58e2d0cdccd82924c7a44fd93f4c38.tar.xz | |
Merge remote-tracking branch 'origin/release-v0.12.0' v0.12.0
Diffstat (limited to 'synapse/storage/registration.py')
| -rw-r--r-- | synapse/storage/registration.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py index 2e5eddd259..09a05b08ef 100644 --- a/synapse/storage/registration.py +++ b/synapse/storage/registration.py @@ -258,10 +258,10 @@ class RegistrationStore(SQLBaseStore): @defer.inlineCallbacks def user_add_threepid(self, user_id, medium, address, validated_at, added_at): yield self._simple_upsert("user_threepids", { - "user_id": user_id, "medium": medium, "address": address, }, { + "user_id": user_id, "validated_at": validated_at, "added_at": added_at, }) |