Laurent Destailleur a2a15ceb5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/prelevement/create.php htdocs/compta/prelevement/demandes.php htdocs/core/class/html.form.class.php		2020-05-27 23:07:18 +02:00
..
common	Merge pull request #13512 from frederic34/zopflipng	2020-04-08 14:48:38 +02:00
eldy	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-05-27 23:07:18 +02:00
md	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-05-27 23:07:18 +02:00
.gitignore
dolibarr_256x256_color.png	Fix logo	2020-05-25 12:50:54 +02:00
dolibarr_512x512_white.png	Restore missing png file	2020-05-25 13:36:56 +02:00
dolibarr_logo_bw.png	compress png with zopflipng	2020-04-06 19:03:48 +02:00
dolibarr_logo.jpg	Fix logo	2020-05-25 12:50:54 +02:00
dolibarr_logo.png	Fix logo	2020-05-25 12:50:54 +02:00
dolibarr_logo.svg	Fix logo	2020-05-25 12:50:54 +02:00
dolibarr_preferred_partner.png	Fix logo	2020-05-25 12:50:54 +02:00
dolibarr.png	Update logo	2020-05-25 13:32:57 +02:00
dolistore_logo.jpg	Fix logo	2020-05-25 12:50:54 +02:00
dolistore_logo.png	Fix logo	2020-05-25 12:50:54 +02:00
dolistore_logo.svg	Fix logo	2020-05-25 12:50:54 +02:00
index.html