Laurent Destailleur c750ba8b99 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/filefunc.inc.php
	htdocs/install/mysql/data/llx_c_payment_term.sql
	htdocs/langs/en_US/bills.lang
	htdocs/langs/en_US/mails.lang

2016-12-16 13:56:55 +01:00

..

.gitignore

Exclude conf.php file from git

2013-08-10 13:02:13 +02:00

.htaccess

…

conf.php.example

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

2016-12-16 13:56:55 +01: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