(minimum for possibility to merge with 3.2) Conflicts: htdocs/core/modules/livraison/modules_livraison.php htdocs/livraison/class/livraison.class.php |
||
|---|---|---|
| .. | ||
| expedition.class.php | ||
| expeditionstats.class.php | ||
(minimum for possibility to merge with 3.2) Conflicts: htdocs/core/modules/livraison/modules_livraison.php htdocs/livraison/class/livraison.class.php |
||
|---|---|---|
| .. | ||
| expedition.class.php | ||
| expeditionstats.class.php | ||