Merge remote-tracking branch 'origin/main' into QRCodes
# Conflicts: # src/main/java/Team5/SmartTowns/trails/TrailsController.java # src/main/resources/data.sql
No related branches found
No related tags found
Showing
- src/main/java/Team5/SmartTowns/Landmarks/Landmarks.java 5 additions, 2 deletionssrc/main/java/Team5/SmartTowns/Landmarks/Landmarks.java
- src/main/java/Team5/SmartTowns/trails/Trail.java 1 addition, 0 deletionssrc/main/java/Team5/SmartTowns/trails/Trail.java
- src/main/resources/data.sql 2 additions, 8 deletionssrc/main/resources/data.sql
- src/main/resources/static/css/dragonstaless.css 13 additions, 4 deletionssrc/main/resources/static/css/dragonstaless.css
- src/main/resources/static/scripts/qrCode.js 0 additions, 0 deletionssrc/main/resources/static/scripts/qrCode.js
- src/main/resources/templates/towns/trails/dragonstale/index.html 20 additions, 5 deletions...n/resources/templates/towns/trails/dragonstale/index.html
- src/main/resources/templates/towns/trails/welshhistory/welshhistory.html 0 additions, 10 deletions...ces/templates/towns/trails/welshhistory/welshhistory.html
src/main/resources/static/scripts/qrCode.js
0 → 100644
Please register or sign in to comment