Laurent Destailleur 06b3f6a62f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/subscription/list.php		2019-06-25 13:03:54 +02:00
..
ckeditor	Fix when using image into description	2019-01-31 18:12:34 +01:00
doc	fix travis	2019-03-07 15:49:16 +01:00
img	Add picto for BOM	2019-04-10 11:49:43 +02:00
tpl
.gitignore
AUTHOR
badges.inc.php	CSS	2019-05-21 21:36:48 +02:00
btn.inc.php	Sync transifex	2019-06-22 13:18:33 +02:00
dropdown.inc.php	Sync transifex	2019-06-22 13:18:33 +02:00
global.inc.php	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-25 13:03:54 +02:00
index.html
main_menu_fa_icons.inc.php	Fix typo	2019-03-16 14:48:41 +01:00
style.css.php	Fix css	2019-05-20 12:16:39 +02:00
theme_vars.inc.php	Fix css	2019-05-20 12:16:39 +02:00
thumb.png