Conflicts: ChangeLog htdocs/.gitignore htdocs/comm/mailing/card.php htdocs/commande/list.php htdocs/compta/facture.php htdocs/expedition/class/expedition.class.php |
||
|---|---|---|
| .. | ||
| class | ||
| card.php | ||
| clients.php | ||
| index.php | ||
| quadri_detail.php | ||
| reglement.php | ||
Conflicts: ChangeLog htdocs/.gitignore htdocs/comm/mailing/card.php htdocs/commande/list.php htdocs/compta/facture.php htdocs/expedition/class/expedition.class.php |
||
|---|---|---|
| .. | ||
| class | ||
| card.php | ||
| clients.php | ||
| index.php | ||
| quadri_detail.php | ||
| reglement.php | ||