Commit 758a0f22 authored by Christopher Collin Løkken's avatar Christopher Collin Løkken 🛀
Browse files

Merge branch 'urlrefactor' into 'master'

resolved merge conflict on branch chris

See merge request !6
parents 7b1096cb d41bc047
Pipeline #171226 passed with stages
in 2 minutes and 33 seconds