Skip to content
Snippets Groups Projects
Commit de14e7f5 authored by Gabriel Copat's avatar Gabriel Copat
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 77-as-a-user-i-want-to-be-able-to-use-the-application-on-any-device-e-g-iphone-ipad-laptop

# Conflicts:
#	src/main/resources/data.sql
#	src/test/resources/data.sql
#	src/test/resources/schema.sql
parents 485c0684 6a4491e8
1 merge request!36Resolve "As a user I want to be able to use the application on any device e.g. iPhone, iPad, Laptop"
Hide whitespace changes
Inline Side-by-side
Showing
with 564 additions and 251 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