Merge branch 'main' into auth/pm-1214/device-management-screen

bitwarden · Jan 4, 2025 · ca0cbf6 · ca0cbf6
2 parents 78ac02d + 196c1e1
commit ca0cbf6
Show file tree

Hide file tree

Showing 23 changed files with 267 additions and 442 deletions.
diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
@@ -1193,7 +1193,7 @@ jobs:
         if: |
           github.event_name != 'pull_request_target'
           && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc-desktop')
-        uses: slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3 # v1.27.1
+        uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # v2.0.0
         with:
           channel-id: C074F5UESQ0
           payload: |

diff --git a/apps/browser/src/_locales/hr/messages.json b/apps/browser/src/_locales/hr/messages.json
@@ -1005,7 +1005,7 @@
     "message": "Prikazuj identitete za jednostavnu auto-ispunu."
   },
   "clickToAutofillOnVault": {
-    "message": "Click items to autofill on Vault view"
+    "message": "Klikni stavke za auto-ispunu na prikazu trezora"
   },
   "clearClipboard": {
     "message": "Očisti međuspremnik",