Skip to content
Snippets Groups Projects
Commit acc525ea authored by Seb Barnard's avatar Seb Barnard :speech_balloon:
Browse files

Merge branch 'issueSeven' into 'develop'

# Conflicts:
#   src/main/java/com/example/clientproject/web/controllers/HomeController.java
#   src/main/java/com/example/clientproject/web/controllers/SignInController.java
parents 70a2eee7 a4fa6eaa
Branches
No related tags found
5 merge requests!56tags will be saved to userFavTags table (needs user ID of current logged in user),!50Merging for latest changes,!46Develop,!44Branch update,!43Develop
Showing
with 172 additions and 46 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment