Merge branch 'master' of /Applications/XAMPP/xamppfiles/htdocs/docu with conflicts.
Merge remote-tracking branch 'origin/master'
Début connexion docu