Laurent Destailleur b16b1c2ce0 Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: htdocs/core/lib/functions2.lib.php htdocs/langs/en_US/errors.lang htdocs/product/class/product.class.php		2014-09-18 10:08:56 +02:00
..
admin	Merge pull request #1568 from GPCsolutions/closingtagremoval	2014-05-04 18:08:37 +02:00
ajax	Removed closing php tag	2014-05-03 18:18:44 +02:00
canvas	Removed closing php tag	2014-05-03 18:18:44 +02:00
class	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-09-18 10:08:56 +02:00
composition	Removed closing php tag	2014-05-03 18:18:44 +02:00
stats	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-09-13 19:10:05 +02:00
stock	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-09-13 19:10:05 +02:00
document.php	Fix: Can upload files on services.	2014-08-26 23:45:02 +02:00
fiche.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-09-15 22:52:59 +02:00
fournisseurs.php	Fix: [ bug #1427 ] erreur avec le bouton fiche suivante/précédente	2014-06-20 13:43:36 +02:00
index.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-09-13 19:10:05 +02:00
liste.php	Merge remote-tracking branch 'origin/3.5' into develop	2014-05-29 19:20:48 +02:00
photos.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
popuprop.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
price.php	Fix: balance with td	2014-09-02 19:45:05 +02:00
reassort.php	Fix: bad translation key	2014-09-15 20:23:04 +02:00
traduction.php	Fix: Deletion of translation has disappeared.	2014-06-20 15:05:39 +02:00