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

Merge branch 'develop' into 'issueThirtyFour' 

# Conflicts:
#   src/main/java/com/example/clientproject/web/controllers/BusinessDetails.java
parents 3cfeff6a d5ed9154
No related branches found
No related tags found
3 merge requests!114LoggingService service class, new method to add a log to the "Logs" table when...,!104Branch Update,!103Issue thirty four
Hide whitespace changes
Inline Side-by-side
Showing
with 646 additions and 89 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