Laurent Destailleur b889db997a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture.php htdocs/core/datepicker.php htdocs/core/get_menudiv.php htdocs/core/menus/standard/auguria.lib.php htdocs/core/menus/standard/eldy.lib.php htdocs/core/search_page.php htdocs/main.inc.php htdocs/master.inc.php htdocs/product/list.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php htdocs/user/card.php htdocs/user/index.php		2017-06-14 10:48:34 +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	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
.gitignore	Prepare freeze	2014-11-07 21:52:50 +01:00
AUTHOR
graph-color.php	Fix bookmark jump	2017-05-06 21:39:00 +02:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
style.css.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-14 10:48:34 +02:00
thumb.png	Optimized theme images	2014-08-19 12:39:25 +02:00