saret/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2026-05-25 13:30:19 +03:00
Code Issues 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
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/core/ciphers.rs
+2 -2
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 // 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!({ Ok(Json(json!({
"data": ciphers, "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 // 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!({ Ok(Json(json!({
"data": ciphers, "data": ciphers,