Conflicts: htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php htdocs/societe/list.php |
||
|---|---|---|
| .. | ||
| doc | ||
| mod_myobject_advanced.php | ||
| mod_myobject_standard.php | ||
| modules_myobject.php | ||
Conflicts: htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php htdocs/societe/list.php |
||
|---|---|---|
| .. | ||
| doc | ||
| mod_myobject_advanced.php | ||
| mod_myobject_standard.php | ||
| modules_myobject.php | ||