Conflicts: htdocs/core/class/extrafields.class.php htdocs/product/price.php htdocs/user/perms.php |
||
|---|---|---|
| .. | ||
| api_users.class.php | ||
| index.html | ||
| user.class.php | ||
| userbankaccount.class.php | ||
| usergroup.class.php | ||
Conflicts: htdocs/core/class/extrafields.class.php htdocs/product/price.php htdocs/user/perms.php |
||
|---|---|---|
| .. | ||
| api_users.class.php | ||
| index.html | ||
| user.class.php | ||
| userbankaccount.class.php | ||
| usergroup.class.php | ||