Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2014-03-17 20:45:09 +01:00
commit 82c2ef9773

View File

@ -110,4 +110,4 @@ ConfirmDeletePicture=Confirm picture deletion?
ExtraFieldsCategories=Complementary attributes
CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory