Laurent Destailleur 252d8da8fc Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/categories/class/categorie.class.php htdocs/core/class/commondocgenerator.class.php htdocs/core/lib/functions.lib.php htdocs/core/modules/DolibarrModules.class.php htdocs/filefunc.inc.php htdocs/societe/class/societe.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php		2017-07-07 15:11:53 +02:00
..
admin	Fix use the getUrl function instead of hard coded curl	2017-07-04 10:55:53 +02:00
class	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-07 15:11:53 +02:00
card.php	Look and feel v6	2017-06-21 11:37:34 +02:00
edit.php	FIX #6985	2017-06-11 10:37:58 +02:00
index.php	Fix remove warnings	2017-06-22 11:04:29 +02:00
photos.php	Fix var not sanitized	2017-05-16 13:27:32 +02:00
traduction.php	Work on look and feel v6	2017-04-06 21:48:28 +02:00
viewcat.php	Maxi debug of v6	2017-06-07 19:28:31 +02:00