Conflicts: ChangeLog htdocs/comm/propal.php htdocs/commande/fiche.php htdocs/societe/class/societe.class.php |
||
|---|---|---|
| .. | ||
| amarok | ||
| auguria | ||
| bureau2crea | ||
| cameleo | ||
| common | ||
| eldy | ||
| .gitignore | ||
| dolibarr_logo.png | ||
| dolibarr.png | ||
| doliforge_logo.png | ||
| dolistore_logo.png | ||
| index.php | ||
| login_background.png | ||
| login_logo.png | ||