Conflicts: htdocs/core/class/commonobject.class.php htdocs/core/tpl/originproductline.tpl.php htdocs/fourn/facture/card.php htdocs/install/mysql/migration/14.0.0-15.0.0.sql htdocs/user/card.php |
||
|---|---|---|
| .. | ||
| api_users.class.php | ||
| user.class.php | ||
| userbankaccount.class.php | ||
| usergroup.class.php | ||