Commit d4d5088b authored 1 year ago by Connor Brock

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

Merge remote-tracking branch 'origin/main' into 80-as-a-convenience-enthusiast-i-want-a-drop-down-menu-to-be-able-to-quickly-scan-qr-codes-i-find

# Conflicts:
#	src/main/java/Team5/SmartTowns/landmarks/Landmarks.java

parents 250d0337 6a4491e8

No related branches found

No related tags found

1 merge request!41Resolve "As a convenience enthusiast, I want a drop down menu to be able to quickly scan QR codes I find along my dragon trail so that I may continue on my adventure without disruption."

Hide whitespace changes

Inline Side-by-side

Showing with 1059 additions and 919 deletions

Please register or to comment