Skip to content
Snippets Groups Projects
Commit 79814b71 authored by Ethan Allen-Harris's avatar Ethan Allen-Harris
Browse files

Merge branch 'issueTwentyThree' into 'develop' 

merging branch into develop

See merge request !82
parents 80767a7f 57776ea7
Branches
Tags
4 merge requests!114LoggingService service class, new method to add a log to the "Logs" table when...,!88fixed small bug,!87added non-functional testing (see DeleteShopTests.java for notes) + added serverside validation,!82merging branch into develop
Hide whitespace changes
Inline Side-by-side
Showing
with 148 additions and 6 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment