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
..
dolistore.class.php	Fix travis	2017-09-14 08:26:13 +02:00
init.php	Clean code	2017-09-01 23:56:59 +02:00
PSWebServiceLibrary.class.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-14 21:57:14 +02:00