Laurent Destailleur 1ca5c7083a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formother.class.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php		2018-03-07 11:54:48 +01:00
..
common	Add picto for cheque payment	2017-09-20 15:29:47 +02:00
eldy	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-07 11:54:48 +01:00
md	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-07 11:54:48 +01:00
.gitignore
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
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
login_logo.png