Skip to content
Snippets Groups Projects
Commit e78410a7 authored by Floris Claessens's avatar Floris Claessens
Browse files

Merge branch 'feature/ASDCBA-000-ui' into sub-task/ASDCBA-000-ui-QOL

# Conflicts:
#	src/main/resources/database.sqlite
parents ba3228cb e42ea118
Branches sub-task/ASDCBA-000-ui-QOL
4 merge requests!111Release candidate to main,!102MR/final development into release-candidate,!101MR/ui-to-develop,!66Added a scrollpane and fixed issues caused by it
Pipeline #7284 passed with stages
in 2 minutes and 57 seconds
Showing
with 391 additions and 127 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