Laurent Destailleur 838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php

2019-12-14 14:53:49 +01:00

..

export_csv.modules.php

Merge branch 'develop' into 11.0_https

2019-10-01 06:11:43 +02:00

export_excel2007.modules.php

Merge branch 'develop' into 11.0_https

2019-10-01 06:11:43 +02:00

export_excel2007new.modules.php

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

2019-12-14 14:53:49 +01:00

export_excel.modules.php

The variable $letter does not seem...

2019-12-01 18:52:50 +01:00

export_tsv.modules.php

Merge branch 'develop' into 11.0_https

2019-10-01 06:11:43 +02:00

index.html

…

modules_export.php

Move Gnu.org to https

2019-09-23 21:55:30 +02:00