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

Conflicts:
	ChangeLog
	htdocs/comm/fiche.php
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/fiche.php
	htdocs/langs/fr_FR/compta.lang
	htdocs/projet/element.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/time.php

2014-12-26 04:44:15 +01: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

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

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

tabs

Fixed: [ bug #1654 ] Can't display margins in product card

2014-12-14 15:44:22 +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

2014-12-18 11:42:55 +01:00

index.php

Removed closing php tag

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

productMargins.php

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

2014-11-23 16:51:25 +01:00