Amirhossein Mahmoodi b7363f2e92 Merge branch 'develop' into 'feature/development_assistant' ...

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

2023-08-12 16:16:41 +03:30

..

fa

Merge branch 'develop' into 'feature/development_assistant'

2023-08-12 16:16:41 +03:30