dahjah/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2026-05-12 17:09:39 -06:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix merge conflict (#7164)

Browse Source
This commit is contained in:
Daniel García 2026-04-29 22:47:42 +02:00 committed by GitHub
parent 8c3c969938
commit c3bd1eb565
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/core/ciphers.rs
View File

@ -2056,7 +2056,7 @@ async fn archive_multiple_ciphers(
}
// Multi archive does not send out a push for each cipher, we need to send a general sync here
nt.send_user_update(UpdateType::SyncCiphers, &headers.user, &headers.device.push_uuid, conn).await;
nt.send_user_update(UpdateType::SyncCiphers, &headers.user, headers.device.push_uuid.as_ref(), conn).await;
Ok(Json(json!({
"data": ciphers,
@ -2082,7 +2082,7 @@ async fn unarchive_multiple_ciphers(
}
// Multi unarchive does not send out a push for each cipher, we need to send a general sync here
nt.send_user_update(UpdateType::SyncCiphers, &headers.user, &headers.device.push_uuid, conn).await;
nt.send_user_update(UpdateType::SyncCiphers, &headers.user, headers.device.push_uuid.as_ref(), conn).await;
Ok(Json(json!({
"data": ciphers,