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

..

background.png

…

default.css

Fix css for support page

2015-08-28 20:39:30 +02:00

helpcenter.png

…

inc.php

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-06-14 10:48:34 +02:00

index.php

Clean admin menu entries

2017-02-22 02:19:50 +01:00

internet.png

…

mail.png

…

online.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

pagemaster.png

…

redstar.png

…

star.png

…

who.png

…