Merge branch 'louis' into developer
Merge branch 'louis' into developer
Merge branch 'louis' into developer
Merge branch 'louis' into developer
déboguer + ajouter un article (commencer)
Merge branch 'refs/heads/lfinal' into developer
Conflicts:
	add_edit.php
	inc/afficherTousLesArticles.php
	inc/bd.php
Merge branch 'developer' into louis
Changement majeure du 26 aug 15:09