Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts: htdocs/install/mysql/migration/repair.sql
No related branches found
No related tags found
Showing
- htdocs/core/lib/functions2.lib.php 1 addition, 1 deletionhtdocs/core/lib/functions2.lib.php
- htdocs/install/mysql/migration/repair.sql 11 additions, 0 deletionshtdocs/install/mysql/migration/repair.sql
- htdocs/product/admin/product_tools.php 6 additions, 3 deletionshtdocs/product/admin/product_tools.php
Loading
Please register or sign in to comment