Laurent Destailleur 61d7629ab1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/list.php		2018-08-08 17:44:22 +02:00
..
common	Upgrade octicons	2018-04-15 11:27:39 +02:00
eldy	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-08 17:44:22 +02:00
md	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-08 17:44:22 +02: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
dolistore_logo.png
index.html
login_logo.png