résolution conflit nubesModif.php
Revert "résolution conflit nubesModif.php"

This reverts commit 336e771f8242a9132fdc3be8da24bb861f6950ec.
Merge branch 'master' of https://github.com/NicolasMura/SITEatou