Conflicts: build/debian/changelog htdocs/filefunc.inc.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql |
||
|---|---|---|
| .. | ||
| api_commande.class.php | ||
| commande.class.php | ||
| commandestats.class.php | ||
| index.html | ||
Conflicts: build/debian/changelog htdocs/filefunc.inc.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql |
||
|---|---|---|
| .. | ||
| api_commande.class.php | ||
| commande.class.php | ||
| commandestats.class.php | ||
| index.html | ||