Commit 6d120c0e authored by Robert Hitt's avatar Robert Hitt

Merge branch 'settings' into 'master'

Settings

See merge request !8
parents 3482956e 5b721131
Pipeline #867 passed with stages
in 4 minutes and 34 seconds