Merge remote-tracking branch 'origin/master'
continuous-integration/drone/push Build encountered an error
Details
continuous-integration/drone/push Build encountered an error
Details
# Conflicts: # Site Web/client/src/components/Configurations/ConfigurationDuProfil.js # Site Web/client/src/styles/component/_navbar.scssmaster
commit
825e92e50c