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
..
admin	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-30 15:53:06 +01:00
bookkeeping	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-30 15:53:06 +01:00
class	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-30 15:53:06 +01:00
customer	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-30 15:53:06 +01:00
journal	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-30 15:53:06 +01:00
supplier	Align module with 3.7 & contrary	2015-01-25 15:24:16 +01:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00