|
|
5c742411d5
|
Merge branch 'main' into tracker-connect-back
# Conflicts:
# src/assets/images/accept.png
# src/assets/images/mainTaskCommentImg.png
# src/components/Modal/TrackerModal/TrackerModal.jsx
# src/components/UI/ModalTicket/ModalTicket.jsx
# src/components/UI/TicketFullScreen/TicketFullScreen.jsx
# src/pages/ProjectTracker/ProjectTracker.js
# src/redux/projectsTrackerSlice.js
|
2023-06-12 22:22:51 +03:00 |
|
