Fix merge conflicts

2026-09-22 13:39:35 +00:00 · 2023-07-21 20:49:41 +07:00
parent d9f6c27e4d 9cef35e9e6
commit f450be3a00
217 changed files with 11802 additions and 20564 deletions
--- a/frontend/public/data/frequentConstants.ts
+++ b/frontend/public/data/frequentConstants.ts
@@ -21,6 +21,7 @@ const integrationSlugNameMapping: Mapping = {
  checkly: "Checkly",
  "hashicorp-vault": "Vault",
  "cloudflare-pages": "Cloudflare Pages",
+  "codefresh": "Codefresh",
  bitbucket: "BitBucket"
 };

--- a/frontend/public/images/integrations/codefresh.png
+++ b/frontend/public/images/integrations/codefresh.png
--- a/frontend/public/lotties/system-outline-69-document-scan.json
+++ b/frontend/public/lotties/system-outline-69-document-scan.json