Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop

This commit is contained in:
Hillel Coren 2017-07-17 10:45:15 +03:00
commit 083da06a40

View File

@ -35,6 +35,7 @@ class ActivityTransformer extends EntityTransformer
'expense_id' => $activity->expense_id ? $activity->expense->public_id : null,
'is_system' => $activity->is_system ? (bool) $activity->is_system : null,
'contact_id' => $activity->contact_id ? $activity->contact->public_id : null,
'task_id' => $activity->task_id ? $activity->task->public_id : null,
];
}
}