Laurent Destailleur f40afcf023 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/accountancy/class/bookkeeping.class.php htdocs/compta/facture/list.php htdocs/compta/paiement/class/cpaiement.class.php htdocs/compta/sociales/card.php htdocs/core/lib/functions.lib.php htdocs/expensereport/card.php htdocs/expensereport/class/expensereport.class.php htdocs/product/stats/facture.php		2017-07-08 18:32:34 +02:00
..
class	Fix look and feel v6	2017-06-13 15:34:18 +02:00
img	Add table llx_holiday_types to store type of leave.	2014-08-06 03:01:17 +02:00
card.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-07-08 18:32:34 +02:00
common.inc.php	Fix require_once instead of require.	2016-11-24 17:03:18 +01:00
define_holiday.php	Fix look and feel v6	2017-06-13 15:34:18 +02:00
document.php	FIX #6945	2017-06-06 10:53:53 +02:00
index.html	Fix: wrong path and add index.html	2015-07-13 10:07:38 +02:00
list.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-07-08 18:32:34 +02:00
view_log.php	Fix missing translation	2017-06-10 22:57:25 +02:00