Commit 9965d6c3 authored by Tomas Vaagen Gule's avatar Tomas Vaagen Gule
Browse files

Merge branch 'master' of gitlab.stud.idi.ntnu.no:tdt4242-gr24/tdt4242-base

parents 798bb3b6 9aab192f
Pipeline #164991 passed with stages
in 2 minutes and 4 seconds