Laurent Destailleur fb811a1656 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/system/database-tables.php htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/core/class/commonobject.class.php htdocs/langs/fr_FR/withdrawals.lang htdocs/societe/class/societe.class.php		2020-08-03 14:44:01 +02:00
..
ckeditor	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 18:21:59 +02:00
img	Look and feel v12	2020-04-20 19:39:34 +02:00
tpl
.gitignore
AUTHOR
badges.inc.php	Scrutinizer Auto-Fixes	2019-12-17 02:00:52 +00:00
btn.inc.php	Scrutinizer Auto-Fixes	2020-04-10 08:59:32 +00:00
dropdown.inc.php	FIX #14076	2020-07-29 12:31:03 +02:00
index.html
info-box.inc.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-07-27 19:35:34 +02:00
main_menu_fa_icons.inc.php	Scrutinizer Auto-Fixes	2020-04-10 08:59:32 +00:00
manifest.json.php	CSS	2020-05-25 12:51:17 +02:00
progress.inc.php	Scrutinizer Auto-Fixes	2020-04-10 08:59:32 +00:00
style.css.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-08-03 14:44:01 +02:00
theme_vars.inc.php	add new rule	2020-05-21 15:05:19 +02:00
thumb.png	compress png with zopflipng	2020-04-06 19:03:48 +02:00