Laurent Destailleur be4fe3d0d0 Merge branch 'syslog' of github.com:marcosgdf/dolibarr into ... marcosgdf-syslog Conflicts: htdocs/contrat/class/contrat.class.php htdocs/fichinter/class/fichinter.class.php htdocs/projet/class/project.class.php htdocs/projet/class/task.class.php		2014-07-04 13:43:50 +02:00
..
class	Merge branch 'syslog' of github.com:marcosgdf/dolibarr into	2014-07-04 13:43:50 +02:00
rapport	More substitutions	2014-06-12 11:31:53 +02:00
contact.php	Fix: [ bug #1374 ] Salaries module requires "Special costs" module to	2014-05-10 18:57:04 +02:00
document.php	Fix: [ bug #1374 ] Salaries module requires "Special costs" module to	2014-05-10 18:57:04 +02:00
fiche.php	FIX : [ bug #1496 ] ACTION_DELETE trigger does not show trigger error	2014-07-03 15:39:40 +02:00
index.php	Merge branch 'develop' into syslog	2014-07-02 21:20:02 +02:00
info.php	Fix: [ bug #1374 ] Salaries module requires "Special costs" module to	2014-05-10 18:57:04 +02:00
listactions.php	Merge branch 'develop' into syslog	2014-07-02 21:20:02 +02:00