Laurent Destailleur 4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php

2015-01-30 15:53:06 +01:00

..

card.php

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

2015-01-30 15:53:06 +01:00

index.php

Align module with 3.7 & contrary

2015-01-25 15:24:16 +01:00

lines.php

Align module with 3.7 & contrary

2015-01-25 15:24:16 +01:00

list.php

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

2015-01-30 15:53:06 +01:00