Conflicts: dev/codesniffer/ruleset.xml htdocs/core/class/html.formfile.class.php htdocs/core/lib/functions2.lib.php htdocs/projet/element.php |
||
|---|---|---|
| .. | ||
| address.class.php | ||
| client.class.php | ||
| companybankaccount.class.php | ||
| index.html | ||
| societe.class.php | ||
Conflicts: dev/codesniffer/ruleset.xml htdocs/core/class/html.formfile.class.php htdocs/core/lib/functions2.lib.php htdocs/projet/element.php |
||
|---|---|---|
| .. | ||
| address.class.php | ||
| client.class.php | ||
| companybankaccount.class.php | ||
| index.html | ||
| societe.class.php | ||