-
- Downloads
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
Conflicts: htdocs/install/mysql/tables/llx_c_type_resource.key.sql
No related branches found
No related tags found
Showing
- ChangeLog 7 additions, 0 deletionsChangeLog
- htdocs/core/menus/standard/eldy.lib.php 1 addition, 1 deletionhtdocs/core/menus/standard/eldy.lib.php
- htdocs/core/tpl/document_actions_pre_headers.tpl.php 1 addition, 1 deletionhtdocs/core/tpl/document_actions_pre_headers.tpl.php
- htdocs/fourn/class/fournisseur.commande.class.php 8 additions, 1 deletionhtdocs/fourn/class/fournisseur.commande.class.php
- htdocs/install/mysql/migration/3.5.0-3.6.0.sql 3 additions, 0 deletionshtdocs/install/mysql/migration/3.5.0-3.6.0.sql
- htdocs/install/mysql/tables/llx_c_type_resource.key.sql 1 addition, 1 deletionhtdocs/install/mysql/tables/llx_c_type_resource.key.sql
- htdocs/install/mysql/tables/llx_c_type_resource.sql 1 addition, 1 deletionhtdocs/install/mysql/tables/llx_c_type_resource.sql
- htdocs/langs/en_US/products.lang 2 additions, 1 deletionhtdocs/langs/en_US/products.lang
- htdocs/product/class/product.class.php 1 addition, 1 deletionhtdocs/product/class/product.class.php
- htdocs/product/document.php 1 addition, 1 deletionhtdocs/product/document.php
Loading
Please register or sign in to comment