dolibarr/htdocs/core/modules/import
Laurent Destailleur 192fb45ce7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/adherents/card.php
	htdocs/compta/sociales/list.php
	htdocs/compta/sociales/payments.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/holiday/class/holiday.class.php
	htdocs/viewimage.php
2019-07-30 20:55:15 +02:00
..
import_csv.modules.php Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-30 20:55:15 +02:00
import_xlsx.modules.php Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-30 20:55:15 +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
modules_import.php replace @public by @var 2019-04-18 18:41:02 +02:00