Commit 0d1a1718 authored by Hugo Hörnquist's avatar Hugo Hörnquist

Merge branch 'prislista' into 'master'

Prislista

See merge request !2
parents f9791a04 7cdeb7d7
Pipeline #610 passed with stage
in 1 minute and 29 seconds