Commit 979a2957 authored by Luke Johnston's avatar Luke Johnston

Merge branch 'contributing-file' of gitlab.com:rostools/manifesto into contributing-file

# Conflicts:
#	.gitlab-ci.yml
parents b6acd723 46937d2e
Pipeline #111362604 failed with stage
in 21 seconds