Merge remote-tracking branch 'origin/main' into...
Merge remote-tracking branch 'origin/main' into 81-as-a-child-i-want-a-very-flashy-and-modern-looking-webpage-that-will-draw-me-in-and-keep-me # Conflicts: # src/main/resources/schema.sql # src/test/java/Team5/SmartTownsOld/DataSourceConfig.java # src/test/java/Team5/SmartTownsOld/DataSourceConfigahhhh.java
Showing
- src/main/resources/static/css/mobile-style.css 32 additions, 0 deletionssrc/main/resources/static/css/mobile-style.css
- src/main/resources/templates/WorkWith/local-authorities.html 21 additions, 0 deletionssrc/main/resources/templates/WorkWith/local-authorities.html
- src/main/resources/templates/business-data.html 45 additions, 0 deletionssrc/main/resources/templates/business-data.html
- src/main/resources/templates/businesses.html 28 additions, 0 deletionssrc/main/resources/templates/businesses.html
- src/main/resources/templates/fragments/banners.html 11 additions, 0 deletionssrc/main/resources/templates/fragments/banners.html
- src/main/resources/templates/fragments/trailsPageFrags.html 0 additions, 1 deletionsrc/main/resources/templates/fragments/trailsPageFrags.html
- src/main/resources/templates/landmarks/locationApprovalFormTh.html 6 additions, 7 deletions...resources/templates/landmarks/locationApprovalFormTh.html
- src/main/resources/templates/local-auth-data.html 44 additions, 0 deletionssrc/main/resources/templates/local-auth-data.html
- src/main/resources/templates/local-authorities.html 24 additions, 0 deletionssrc/main/resources/templates/local-authorities.html
- src/main/resources/templates/towns/home/mobile-homepage.html 2 additions, 0 deletionssrc/main/resources/templates/towns/home/mobile-homepage.html
- src/test/java/Team5/SmartTownsOld/DataSourceConfig.java 0 additions, 0 deletionssrc/test/java/Team5/SmartTownsOld/DataSourceConfig.java
Loading
Please register or sign in to comment