Laurent Destailleur d64a87d980 Merge remote-tracking branch 'origin/3.6' into 3.7 ...

Conflicts:
	htdocs/compta/index.php

2015-09-03 10:44:40 +02:00

..

admin

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

lib

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-01-18 17:13:42 +01:00

tabs

Restore data into bannner of thirdparty to have content matching other

2015-02-20 23:29:55 +01:00

agentMargins.php

Merge remote-tracking branch 'origin/3.6' into 3.7

2014-12-26 04:44:15 +01:00

customerMargins.php

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-09-03 10:44:40 +02:00

index.php

Merge remote-tracking branch 'origin/3.5' into 3.6

2015-01-18 15:21:38 +01:00

productMargins.php

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-09-03 10:44:40 +02:00