Laurent Destailleur ad4babb154 Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: .travis.yml htdocs/fichinter/fiche.php		2014-07-08 01:12:55 +02:00
..
project.class.php	Merge branch 'syslog' of github.com:marcosgdf/dolibarr into	2014-07-04 13:43:50 +02:00
task.class.php	Merge remote-tracking branch 'origin/3.6' into develop	2014-07-08 01:12:55 +02:00