AmirHossein Mahmoodi 53f6285edc Merge branch 'develop' into 'feature/commercial_chief' ...

# Conflicts:
#   src/core/data/apiRoutes.js

2023-08-12 11:17:04 +00:00

..

app.json

Merge branch 'develop' into 'feature/commercial_chief'

2023-08-12 11:17:04 +00:00

datatable.js

recode and add editor config file

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