merg conflict

2023-07-15 16:38:26 +03:30
parent 9150cfdcdc
commit d7f3638b67
1 changed files with 1 additions and 0 deletions
--- a/public/locales/fa/app.json
+++ b/public/locales/fa/app.json
@@ -123,3 +123,4 @@
    "button-reject": "عدم تایید",
    "button-cancel": "بستن"
  }
+}