Commit 2edbe8e0 authored by Patrick Harlan's avatar Patrick Harlan

Merge branch 'test-squash' into 'master'

Test squash

See merge request !2
parents 2e5a4fe8 a0248831
Pipeline #660 failed