Laurent Destailleur 9d10eb57f2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/dolibarr_changes.txt htdocs/compta/facture/card.php htdocs/compta/facture/list.php htdocs/main.inc.php		2017-12-20 13:28:41 +01:00
..
common	Add picto for cheque payment	2017-09-20 15:29:47 +02:00
eldy	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-20 13:28:41 +01:00
md	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-20 13:28:41 +01:00
.gitignore	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-09-22 16:28:34 +02:00
dolibarr_logo.png	NEW Add last activation author and ip of modules	2017-05-06 20:43:14 +02:00
dolibarr_preferred_partner_int.png	Fix: Typo and translation	2014-12-17 01:56:36 +01:00
dolibarr.png	Fix #3930 Removed executable bit	2015-12-09 13:28:36 +01:00
dolistore_logo.png	Fix #3930 Removed executable bit	2015-12-09 13:28:36 +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
login_logo.png	Optimized theme images	2014-08-19 12:39:25 +02:00