dolibarr/htdocs/expedition
Laurent Destailleur ab177b43af Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
2015-11-13 12:35:10 +01:00
..
class Merge remote-tracking branch 'origin/3.8' into develop 2015-11-13 12:35:10 +01:00
stats Merge pull request #3592 from GPCsolutions/select_users 2015-09-26 08:44:34 +02:00
tpl [Qual] Replaced deprecated print_titre() 2015-09-24 18:27:13 +02:00
card.php Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default. 2015-11-12 21:25:01 +01:00
contact.php FIX #3534 2015-09-16 22:04:03 +02:00
index.php [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
list.php Optioncss 2015-10-04 12:31:32 +02:00
note.php Bad width 2015-01-23 18:41:53 +01:00
shipment.php Merge pull request #3776 from frederic34/patch-15 2015-10-22 12:16:40 +02:00