-
- Downloads
Merge remote-tracking branch 'origin/3.5' into develop
Conflicts: htdocs/core/class/doleditor.class.php htdocs/main.inc.php htdocs/product/class/product.class.php
Showing
- htdocs/core/tpl/objectline_edit.tpl.php 25 additions, 15 deletionshtdocs/core/tpl/objectline_edit.tpl.php
- htdocs/main.inc.php 7 additions, 3 deletionshtdocs/main.inc.php
- htdocs/product/class/product.class.php 5 additions, 5 deletionshtdocs/product/class/product.class.php
- htdocs/projet/tasks.php 1 addition, 1 deletionhtdocs/projet/tasks.php
Loading
Please register or sign in to comment