Merge branch 'main' into tracker-connect-back

# Conflicts: # src/components/Modal/TrackerModal/trackerModal.scss # src/components/UI/ModalTicket/ModalTicket.jsx
2023-06-26 12:42:32 +03:00
parent fc6feca92d 0f63b597f2
commit dc123e1fc7
21 changed files with 1913 additions and 2446 deletions
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@ -2,4 +2,4 @@
 . "$(dirname -- "$0")/_/husky.sh"

 npm run format
-npm run lint
+#npm run lint