Skip to content
Snippets Groups Projects
Commit b3a76168 authored by Gabriel Copat's avatar Gabriel Copat
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 73-as-a-qr-scanning-connoisseur-i-want-to-unlock-stickers-after-scanning-a-qr-code-to-feel-a-sense

# Conflicts:
#	src/main/java/Team5/SmartTowns/data/MockUser.java
#	src/main/java/Team5/SmartTowns/data/QRCodes.java
#	src/main/java/Team5/SmartTowns/trails/TrailsController.java
#	src/main/java/Team5/SmartTowns/users/User.java
#	src/main/java/Team5/SmartTowns/users/UserRepository.java
#	src/main/java/Team5/SmartTowns/users/UserRepositoryJDBC.java
#	src/main/resources/data.sql
#	src/main/resources/schema.sql
parents 8477f9ae a9ddc9f2
No related branches found
No related tags found
1 merge request!33Resolve "As a QR-scanning connoisseur , I want to unlock stickers after scanning a QR code to feel a sense of reward."
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1108 additions and 27 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment