Files
dolibarr/htdocs/bookmarks
Laurent Destailleur dbaa43f3be Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/holiday/card.php
	htdocs/holiday/list.php
	htdocs/user/card.php
2016-01-23 11:45:39 +01:00
..
2015-04-18 20:50:03 +02:00
2015-12-04 23:25:34 +01:00