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

Merge branch... 

Merge branch '70-as-a-repeat-trail-visitor-i-want-to-be-able-to-create-an-account-so-i-can-save-and-review-my' into 77-as-a-user-i-want-to-be-able-to-use-the-application-on-any-device-e-g-iphone-ipad-laptop

# Conflicts:
#	src/main/java/Team5/SmartTowns/users/UserController.java
#	src/main/resources/templates/users/login.html
parents 87ad0f8a 9564ad0d
No related branches found
No related tags found
1 merge request!36Resolve "As a user I want to be able to use the application on any device e.g. iPhone, iPad, Laptop"
Hide whitespace changes
Inline Side-by-side
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