Merge branch 'main' into 'statistics-page'
# Conflicts: # src/App.tsx
Showing
- src/App.tsx 2 additions, 2 deletionssrc/App.tsx
- src/components/CountriesList.tsx 2 additions, 2 deletionssrc/components/CountriesList.tsx
- src/components/CountryListCard.tsx 14 additions, 14 deletionssrc/components/CountryListCard.tsx
- src/components/CountryModal.tsx 10 additions, 10 deletionssrc/components/CountryModal.tsx
- src/components/Header.tsx 2 additions, 2 deletionssrc/components/Header.tsx
- src/components/LoginPanel.tsx 12 additions, 11 deletionssrc/components/LoginPanel.tsx
- src/components/RegistrationPanel.tsx 12 additions, 11 deletionssrc/components/RegistrationPanel.tsx
- src/components/WelcomeDescription.tsx 19 additions, 17 deletionssrc/components/WelcomeDescription.tsx
- src/pages/NoPage.tsx 5 additions, 18 deletionssrc/pages/NoPage.tsx
- tailwind.config.js 12 additions, 1 deletiontailwind.config.js
Please register or sign in to comment