Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main
authorlukel495 <lukel495@su15-110.ad.liu.se>
Mon, 27 Nov 2023 07:51:18 +0000 (08:51 +0100)
committerlukel495 <lukel495@su15-110.ad.liu.se>
Mon, 27 Nov 2023 07:51:18 +0000 (08:51 +0100)

Trivial merge