Laurent Destailleur d7ad899839 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contrat/card.php htdocs/core/class/conf.class.php htdocs/core/tpl/objectline_view.tpl.php htdocs/holiday/list.php		2018-03-20 14:52:27 +01:00
..
admin	Fix back link of look and feel v7	2018-02-26 09:20:05 +01:00
class	fix scrunitizer	2018-03-10 10:34:11 +01:00
tpl	NEW Look and feel v8: Use a different picto for delete and unlink	2018-03-18 19:13:42 +01:00
card.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-20 14:52:27 +01:00
contact.php	Fix missing hook init	2018-03-02 17:32:54 +01:00
document.php	Fix missing hook init	2018-03-02 17:32:54 +01:00
index.php	Fix ref of contract	2017-12-09 20:58:06 +01:00
info.php	Fix missing hook init	2018-03-02 17:32:54 +01:00
list.php	CSS	2018-03-01 16:48:12 +01:00
note.php	Fix missing hook init	2018-03-02 17:32:54 +01:00
services_list.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-02-14 22:08:18 +01:00