Laurent Destailleur 001f1b4c31 Merge remote-tracking branch 'origin/3.5' into 3.6 ...

Conflicts:
	htdocs/filefunc.inc.php

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

..

admin

Removed closing php tag

2014-05-03 18:18:44 +02:00

lib

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

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

tabs

Fix: use wrong css

2014-05-11 17:56:29 +02:00

agentMargins.php

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

2014-12-26 04:16:08 +01:00

customerMargins.php

FIX: The hours of date filter aren't correct

2015-09-01 09:46:45 +02:00

index.php

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

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

productMargins.php

FIX: The hours of date filter aren't correct

2015-09-01 09:46:45 +02:00