Merge branch 'nginx' of ssh://git.centrale-marseille.fr/clubdrupal into nginx
Conflicts: bin/d7-create-site.sh bin/scripts-config.sh
Merge branch 'nginx' of ssh://git.centrale-marseille.fr/clubdrupal into nginx
Conflicts:
bin/d7-create-site.sh
bin/scripts-config.sh