Laurent Destailleur 83447243ae Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: build/debian/get-orig-source.sh htdocs/product/class/product.class.php htdocs/societe/soc.php		2014-09-15 22:58:39 +02:00
..
edit.php	Merge remote-tracking branch 'origin/3.6' into develop	2014-09-15 22:58:39 +02:00
index.php	Deprecating arbitrary use of dol_htmloutput* functions	2014-07-20 02:32:13 +02:00
other.php	Qual: Remove end php tag.	2014-07-08 01:02:30 +02:00