Skip to content
Snippets Groups Projects
Commit 1c04af2e authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge branch 'feature_Product_stock_subproduct_stock_independent' of 

https://github.com/atm-alexis/dolibarr into
atm-alexis-feature_Product_stock_subproduct_stock_independent

Conflicts:
	htdocs/langs/en_US/products.lang
parents fec9e222 29e5b893
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment