Commit f47f9980 authored by Daniel Shumway's avatar Daniel Shumway

Merge branch 'develop' into 'master'

resume: add "familiar" section

See merge request !51
parents 4542e30b 13d59f8e
Pipeline #36327330 (#137) passed with stages
in 54 seconds