Commit 92689fdc authored by Daniel Shumway's avatar Daniel Shumway

Merge branch 'develop' into 'master'

resume: style updates

See merge request !41
parents 39131b54 fa2c7e0c
Pipeline #31929217 passed with stages
in 2 minutes and 38 seconds