Merge pull request #1273 from frappe/mergify/bp/main-hotfix/pr-1272

2025-09-22 15:17:51 +05:30 · 2025-09-22 15:17:51 +05:30 · 9d0a0d1d32
commit 9d0a0d1d32
parent 9c84a8be7f 803e639961
4 changed files with 1317 additions and 1464 deletions
--- a/.gitignore
+++ b/.gitignore
@ -7,6 +7,5 @@ dev-dist
 tags
 node_modules
 crm/public/frontend
-frontend/yarn.lock
 crm/www/crm.html
 build
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 02fc126fd5c49f0ecf6cce117585f89c4ea585c3
+Subproject commit c9a0fc937cc897864857271b3708a0c675379015
--- a/frontend/package.json
+++ b/frontend/package.json
@ -13,7 +13,7 @@
    "@tiptap/extension-paragraph": "^2.12.0",
    "@twilio/voice-sdk": "^2.10.2",
    "@vueuse/integrations": "^10.3.0",
-    "frappe-ui": "^0.1.197",
+    "frappe-ui": "^0.1.200",
    "gemoji": "^8.1.0",
    "lodash": "^4.17.21",
    "mime": "^4.0.1",
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock