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

Merge branch 'price-global-variables' of 

https://github.com/IonAgorria/dolibarr into
IonAgorria-price-global-variables

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/dynamic_price/editor.php
parents a55af438 e76b6e74
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1491 additions and 80 deletions
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