Laurent Destailleur f3ef6448d7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ...

Conflicts:
	htdocs/admin/supplier_payment.php
	htdocs/core/lib/ajax.lib.php
	htdocs/don/admin/donation.php
	htdocs/product/admin/product.php

2017-08-23 16:11:51 +02:00

..

index.html

…

project_extrafields.php

Look and feel v6

2017-05-24 19:47:02 +02:00

project_task_extrafields.php

Look and feel v6

2017-05-24 19:47:02 +02:00

project.php

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

2017-08-23 16:11:51 +02:00