Commit Graph

3 Commits

Author SHA1 Message Date
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
Laurent Destailleur
c3daad7545 Fix not reachable code 2017-09-04 12:55:32 +02:00
Laurent Destailleur
14cd150762 NEW Introduce experimental feature to search dolistore from application 2017-08-22 14:47:01 +02:00