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

Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/install/mysql/tables/llx_bank_account.sql

2017-05-11 00:03:06 +02:00

..

cron_run_jobs.php

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

2017-05-11 00:03:06 +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