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
..
2015-04-01 16:33:39 +02:00
2014-05-03 18:18:44 +02:00
2015-03-31 11:32:47 +02:00
2014-11-27 21:03:51 +01:00
2015-04-01 16:33:39 +02:00
2015-02-18 21:01:17 +01:00
2015-03-15 14:04:07 +01:00
2014-09-18 20:33:37 +02:00
2015-01-19 20:35:29 +01:00
2014-09-13 19:10:05 +02:00
2015-04-01 16:33:39 +02:00
2014-09-18 20:33:37 +02:00
2015-02-19 00:01:26 +01:00