Laurent Destailleur 0debcf745a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/cron/card.php htdocs/cron/list.php htdocs/filefunc.inc.php		2016-09-09 09:32:14 +02:00
..
ajax	Merge remote-tracking branch 'origin/3.9' into develop	2016-06-04 01:14:36 +02:00
class	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-28 02:40:20 +02:00
commande	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-09 09:32:14 +02:00
facture	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-08 11:39:38 +02:00
js	New add shipping and dispatching from/to multiple warehouses	2015-12-18 18:00:31 +01:00
paiement	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
product	Merge remote-tracking branch 'origin/3.8' into develop	2015-12-27 19:15:20 +01:00
card.php	Uniformize presentation	2016-08-10 07:40:40 +02:00
contact.php	Fix: When a payment mode was disabled, it was not visible on old	2015-12-21 13:56:59 +01:00
index.php	[Qual] Replaced deprecated print_fiche_titre()	2015-09-24 18:34:58 +02:00
recap-fourn.php	Debug and fix when using dolibarr with jmobile	2016-01-03 16:23:23 +01:00