Change partenaires.
...
Merge branch 'master' of github.com:open-international/csapb

Conflicts:
	partenaires/open.html
..
Merge branches 'master' and 'master' of github.com:open-international/csapb