Laurent Destailleur 3b40c95107 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/categories/class/categorie.class.php

2017-09-14 21:57:14 +02:00

..

ajax

…

class

…

css

…

img

…