dolibarr/htdocs/categories
Laurent Destailleur 29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-01-13 19:33:54 +01:00
..
class Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
categorie.php Merge remote-tracking branch 'origin/3.3' into develop 2013-01-13 19:33:54 +01:00
edit.php Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
fiche.php Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
index.php Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
liste.php Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
photos.php Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
viewcat.php Fix: change for a neutral email 2012-12-30 15:13:49 +01:00