Merge branch 'develop' into 'feature/darkLightTheme'

# Conflicts: # src/components/login-expert/index.jsx # src/layouts/MuiLayout.jsx
2023-08-07 10:43:41 +00:00
parent ef83aecd5e aaac273a57
commit d1f031f593
23 changed files with 433 additions and 429 deletions
--- a/public/locales/fa/app.json
+++ b/public/locales/fa/app.json
@@ -111,7 +111,7 @@
  "notifications": {
    "code": "کد",
    "error": "خطا",
-    "warning": "خطر",
+    "warning": "خطا",
    "success": "موفق",
    "error_static_text": "عملیات شما با خطا مواجه شد",
    "warning_static_text": "خطا سرور",