Cocombre ==> Courgette
Merge branch 'develop'

Conflicts:
	list.txt
Commit initial qa
Merge branch 'develop' into qa

Conflicts:
	conf/dependencies.yml
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch qa
# Changes to be committed:
#
#	modified:   conf/dependencies.yml
#
Merge branch 'develop'
Première version de prod
Première version de prod
Merge branch develop
Versin RC
Merge branch origin/develop
Merge branch origin/qa
Merge branch develop, module version update
Merge branch develop, module version update
Merge branch develop, module version update
Merge branch develop, module version update
Merge branch qa, module version update
Merge remote-tracking branch 'origin/develop' into qa
Merge remote-tracking branch 'origin/qa'
Merge branch develop, module version update
Merge branch qa, module version update