Merge branch 'develop' into 'feature/Amin_sakht_tanafos_period'

# Conflicts: # src/components/dashboard/loan-history/index.jsx
2023-12-25 09:56:58 +00:00
parent 65a1ed2716 f8da988e17
commit aafebe8ec8
3 changed files with 14 additions and 12 deletions
--- a/public/locales/fa/app.json
+++ b/public/locales/fa/app.json
@@ -568,6 +568,7 @@
    "vehicle_type": "نوع ماشین",
    "state_name": "وضعیت درخواست",
    "history": "تاریخچه",
+    "province_name": "استان",
    "Table_history_error": "خطا در دریافت اطلاعات",
    "history_report": "فایل ضمیمه",
    "Table_head_name": "نام",