Laurent Destailleur ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture/card.php htdocs/filefunc.inc.php		2018-09-04 21:35:43 +02:00
..
class	fix conflict	2018-09-01 22:40:38 +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 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:36 +02:00
common.inc.php	loadlangs	2018-05-26 21:11:25 +02:00
define_holiday.php	standardize code	2018-08-13 10:20:21 +02:00
document.php	standardize code	2018-08-13 10:20:21 +02:00
index.html	Fix: wrong path and add index.html	2015-07-13 10:07:38 +02:00
list.php	standardize code	2018-08-13 10:20:21 +02:00
month_report.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-04 21:35:43 +02:00
view_log.php	standardize code	2018-08-13 10:20:21 +02:00