dolibarr/htdocs/expedition
Laurent Destailleur fe3f701928 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	htdocs/expedition/list.php
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/user/class/user.class.php
2015-05-16 17:09:42 +02:00
..
class Merge remote-tracking branch 'origin/3.7' into develop 2015-05-07 13:35:09 +02:00
stats Removed closing php tag 2014-05-03 18:18:44 +02:00
tpl Tooltip and lib for file cache 2015-01-24 21:46:05 +01:00
card.php Fix : shipment PDF was not using generation params 2015-05-06 21:29:58 +02:00
contact.php Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00
index.php [Qual] Fixed deprecated HTML nowrap attribute to class 2015-05-12 15:37:35 +02:00
list.php Merge remote-tracking branch 'origin/3.7' into develop 2015-05-16 17:09:42 +02:00
note.php Bad width 2015-01-23 18:41:53 +01:00
shipment.php Look enhancement 2015-05-15 12:53:14 +02:00