Commit fc6b360e authored by Caleb Woodbine's avatar Caleb Woodbine

Merge branch '1.0.2' into 'master'

Version 1.0.2

See merge request safesurfer/SafeSurfer-Desktop!1
parents 4d972df3 4e396857
Pipeline #482 failed with stages
in 10 minutes and 3 seconds