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

Merge branch 'develop' into 'issueThirtyFour' 

# Conflicts:
#   src/main/resources/static/js/manageStaff.js
#   src/main/resources/templates/admin.html
#   src/main/resources/templates/fragments/manageStaff.html
parents 59376b5a 175d1a44
No related branches found
No related tags found
2 merge requests!114LoggingService service class, new method to add a log to the "Logs" table when...,!94Issue thirty four
Hide whitespace changes
Inline Side-by-side
Showing
with 140 additions and 89 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment