Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

530bc862

Commit 530bc862 authored 8 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge branch 'rav/null_default_device_displayname' into develop

parents e555bc65 a6f5cc65

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

synapse/handlers/device.py 1 addition, 1 deletion

synapse/handlers/device.py
synapse/rest/client/v2_alpha/keys.py 1 addition, 3 deletions

synapse/rest/client/v2_alpha/keys.py
synapse/storage/schema/delta/33/devices_for_e2e_keys.sql 1 addition, 1 deletion

synapse/storage/schema/delta/33/devices_for_e2e_keys.sql
synapse/storage/schema/delta/33/devices_for_e2e_keys_clear_unknown_device.sql 20 additions, 0 deletions

...ma/delta/33/devices_for_e2e_keys_clear_unknown_device.sql

with 23 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment