Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

Team 5 - Smart Towns
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

6ebdb676

Commit 6ebdb676 authored 1 year ago by Connor Brock

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/main' into QRCodes

# Conflicts:
#	src/main/java/Team5/SmartTowns/trails/TrailsController.java
#	src/main/resources/data.sql

parents 434da3fe f8c5598f

Branches

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/Team5/SmartTowns/Landmarks/Landmarks.java 5 additions, 2 deletions

src/main/java/Team5/SmartTowns/Landmarks/Landmarks.java
src/main/java/Team5/SmartTowns/trails/Trail.java 1 addition, 0 deletions

src/main/java/Team5/SmartTowns/trails/Trail.java
src/main/resources/data.sql 2 additions, 8 deletions

src/main/resources/data.sql
src/main/resources/static/css/dragonstaless.css 13 additions, 4 deletions

src/main/resources/static/css/dragonstaless.css
src/main/resources/static/scripts/qrCode.js 0 additions, 0 deletions

src/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

with 41 additions and 29 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment