2
0
forked from Wavyzz/dolibarr
Commit Graph

2 Commits

Author SHA1 Message Date
Laurent Destailleur
55140afde4 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
2015-03-22 12:45:04 +01:00
Ion Agorria
fc5899174b Relocation of expression files 2015-03-14 16:48:56 +01:00