AmirHossein Mahmoodi 943a009fc9 Merge branch 'develop' into 'feature/inspector_expert' ...

# Conflicts:
#   public/locales/fa/app.json
#   src/core/data/apiRoutes.js
#   src/core/data/sidebarMenu.jsx

2023-08-12 12:22:17 +00:00

..

app.json

Merge branch 'develop' into 'feature/inspector_expert'

2023-08-12 12:22:17 +00:00

datatable.js

recode and add editor config file

2023-07-31 09:34:59 +03:30