Commit 725160fc authored by Martin Vala's avatar Martin Vala

Merge branch '1-grid-2018-salsa' into 'master'

Resolve "GRID 2018 - SALSA"

Closes #1

See merge request !3
parents 6650690b 71386e35
Pipeline #757 passed with stage
in 25 seconds