# Conflicts:
#   src/main/resources/database/schema.sql

merge

See merge request !108

Issue complete

See merge request !107

Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago

Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>

Addition of method to get event object based on a string, replaced import on main logging function with a string rather than event directly

Branch Update

See merge request !106

Issue thirty

See merge request !105

Branch Update

See merge request !104

Issue thirty four

See merge request !103

# Conflicts:
#   src/main/java/com/example/clientproject/web/controllers/BusinessDetails.java