# Conflicts:
#	.gitlab-ci.yml
#	apps/cli/utilities/contacts_wrest/setup.py
#	ci/bin/generate-yaml.py
#	ci/build.template.yml
#	ci/push.template.yml
#	ci/unit-test.template.yml
#	shared/schema/setup.py
#	shared/workspaces/setup.py