Laurent Destailleur 1af74b4c42 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/skeletons/skeleton_list.php htdocs/admin/perms.php htdocs/core/class/commonobject.class.php htdocs/core/class/hookmanager.class.php htdocs/core/lib/files.lib.php htdocs/product/class/product.class.php htdocs/product/class/service.class.php htdocs/product/index.php htdocs/product/list.php htdocs/public/members/new.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php		2017-06-09 12:50:56 +02:00
..
ckeditor	Work on look and feel v6	2017-04-07 16:16:44 +02:00
img	Work on module website	2017-04-28 13:10:08 +02:00
tpl
.gitignore
AUTHOR
graph-color.php	Fixed md theme name	2015-12-04 18:04:41 +01:00
index.html
style.css.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-09 12:50:56 +02:00
thumb.png