Laurent Destailleur 7760594643 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/website.lang htdocs/theme/eldy/style.css.php htdocs/websites/class/website.class.php htdocs/websites/index.php		2017-07-20 18:31:58 +02:00
..
ckeditor	Debug module website	2017-07-09 22:30:19 +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 '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-20 18:31:58 +02:00
thumb.png