dolibarr/htdocs/install
Laurent Destailleur 21a1e0d7b3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/categories/index.php
	htdocs/comm/action/list.php
	htdocs/comm/action/rapport/index.php
	htdocs/compta/paiement.php
	htdocs/compta/sociales/document.php
	htdocs/compta/tva/document.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/facture/paiement.php
	htdocs/loan/document.php
	htdocs/main.inc.php
2019-06-04 19:03:27 +02:00
..
doctemplates Save files for website template 2019-04-03 16:28:16 +02:00
lib Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
medias Remove image 2019-01-31 12:48:51 +01:00
mssql
mysql Debug module BOM 2019-06-03 22:07:34 +02:00
pgsql Update for pgsql 2019-05-18 01:26:44 +02:00
sqlite3
.gitignore
check.php Fix image link 2019-04-22 17:29:02 +02:00
default.css trim trailing 2018-07-26 18:05:20 +02:00
fileconf.php PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
inc.php Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
index.php Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
install.forced.sample.php
phpinfo.php PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
repair.php Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-04 19:03:27 +02:00
robots.txt
step1.php FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
step2.php update with html5 compliant code 2019-03-15 09:44:17 +01:00
step4.php PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
step5.php Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
upgrade.php update with html5 compliant code 2019-03-15 09:45:01 +01:00
upgrade2.php Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-04 19:03:27 +02:00