Commit fd2601c8 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Merge branch 'spartan' into spartan-timesheet-repport

parents 135d1342 c8272b19
Loading
Loading
Loading
Loading
+1 −1
Changes for module/Oscar/src/Oscar/Formatter/ProjectToArrayFormatter.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ class ProjectToArrayFormatter implements IProjectFormater
        $output['amount'] = $amount;
        $output['pfi'] = implode(', ', $pfi);
        $output['oscarNum'] = implode(', ', $oscarNum);
        $output['type'] = implode(', ', $type);
        $output['type'] = implode(', ', $types);
        $output['status'] = implode(', ', $status);
        $output['start'] = implode(', ', $start);
        $output['end'] = implode(', ', $end);