Laurent Destailleur
8e9c1c4747
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/commande/list.php
htdocs/core/class/notify.class.php
htdocs/core/login/functions_dolibarr.php
htdocs/exports/export.php
htdocs/langs/en_US/admin.lang
2015-04-01 16:33:39 +02:00
..
2014-03-19 11:46:06 +01:00
2014-02-10 01:30:48 +01:00
2013-11-19 21:08:02 +01:00
2014-05-29 20:25:41 +02:00
2014-11-06 13:46:12 +01:00
2015-04-01 16:33:39 +02:00
2015-03-29 09:25:06 +02:00
2014-07-12 23:18:57 +02:00
2015-03-01 16:05:20 +01:00