Skip to content
Snippets Groups Projects
Commit d6a90b79 authored by Joshua Gill's avatar Joshua Gill
Browse files

Merge branch 'develop' into IssueSix

# Conflicts:
#	build.gradle
#	src/main/java/com/example/clientproject/config/SecurityConfig.java
#	src/main/java/com/example/clientproject/data/users/Users.java
#	src/main/java/com/example/clientproject/web/controllers/HomeController.java
#	src/main/java/com/example/clientproject/web/controllers/SignInController.java
#	src/main/resources/database/Data Script/script.sql
#	src/main/resources/templates/fragments/nav.html
parents 8262e536 eddcb12c
No related branches found
No related tags found
4 merge requests!56tags will be saved to userFavTags table (needs user ID of current logged in user),!30merge,!24All Acceptance Criteria Met, password fields on "script.sql" and...,!23IssueSix complete
Showing
with 488 additions and 55 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment