Skip to content
Snippets Groups Projects
Commit 1ed3d3d0 authored by Tore.Brede's avatar Tore.Brede
Browse files

Merge branch 'GREG-28-rebase' into 'master' 

Make changes in GREG-28 work with the changes from GREG-26.

See merge request !36
parents 1a31aa8b 52be83b2
No related branches found
No related tags found
Checking pipeline status
Hide whitespace changes
Inline Side-by-side
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