Laurent Destailleur b883a8092a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/card.php htdocs/core/lib/functions.lib.php htdocs/core/lib/product.lib.php htdocs/core/tpl/extrafields_list_search_input.tpl.php htdocs/fourn/facture/card.php htdocs/product/class/html.formproduct.class.php		2019-10-05 19:35:40 +02:00
..
doctemplates	Added odt support to supplier orders	2019-08-27 16:22:16 +02:00
lib	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
medias	Remove image	2019-01-31 12:48:51 +01:00
mssql
mysql	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-10-05 19:35:40 +02:00
pgsql	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
sqlite3
.gitignore
check.php	Merge pull request #11952 from aspangaro/11.0_https	2019-10-01 14:48:21 +02:00
default.css	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
fileconf.php	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
inc.php	Fix warnings	2019-10-01 11:37:15 +02:00
index.php	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
install.forced.sample.php	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
phpinfo.php	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
repair.php	Merge branch 'develop' into 11.0_https	2019-10-01 06:11:43 +02:00
robots.txt
step1.php	Merge remote-tracking branch 'upstream/develop' into 11.0_https	2019-10-01 06:12:24 +02:00
step2.php	Merge remote-tracking branch 'upstream/develop' into 11.0_https	2019-10-01 06:12:24 +02:00
step4.php	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
step5.php	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
upgrade.php	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
upgrade2.php	Move Gnu.org to https	2019-09-23 21:55:30 +02:00