
Gabriel Copat
authored
Merge branch 'main' into 77-as-a-user-i-want-to-be-able-to-use-the-application-on-any-device-e-g-iphone-ipad-laptop # Conflicts: # src/main/java/Team5/SmartTowns/data/TrailsRepository.java # src/main/java/Team5/SmartTowns/data/TrailsRepositoryJDBC.java # src/main/java/Team5/SmartTowns/landmarks/LandmarksController.java # src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java # src/main/resources/static/css/homePageStyle.css # src/test/java/Team5/SmartTownsOld/DatasourceConfig.java # src/test/java/Team5/SmartTownsOld/users/UserTests.java
Name | Last commit | Last update |
---|---|---|
.. | ||
LocationsCoordinates.java | ||
PlacesController.java | ||
PlacesCoordinatesRepository.java | ||
PlacesCoordinatesRepositoryJDBC.java | ||
TownWithTrails.java |