Commit f85bc1b2 authored by Alan O'Cais's avatar Alan O'Cais

Merge branch 'master' into 'master'

Update the .gitignore and tidy up

See merge request e-cam/E-CAM-Library!126
parents 3f1791fc 8e285c3b
Pipeline #3856 passed with stages
in 1 minute and 51 seconds