etat
Ajout des scripts
Ajout de mes inc
Ajout d'images
Modification pour les include, <article> et finission de active et
desactive
Suppression doublons
Correction d'un oubli
Oups
Update modif_conf.php
Avancement
Update modif_conf.php
Merge branch 'florian' of https://github.com/YellowS4/ISc-DHCP-webmin into florian

Conflicts:
	inc/modif_conf.php

Juste pour que ça te plaise
Merge branch 'florian' of https://github.com/YellowS4/ISc-DHCP-webmin into florian

Conflicts:
	inc/modif_conf.php

push
Merge branch 'master' into florian

Conflicts:
	inc/etat.php

resolution conflit
Merge branch 'florian'
Merge branch 'master' of https://github.com/YellowS4/ISc-DHCP-webmin

Conflicts:
	index.php

reglage des conflit