Merge branch 'release/3.6.1' into develop

Conflicts:
	composer.lock
This commit is contained in:
James Cole
2016-01-09 14:31:52 +01:00
2 changed files with 2 additions and 2 deletions

View File

@@ -385,7 +385,7 @@ class ReportHelper implements ReportHelperInterface
foreach ($accounts as $account) {
$entry = $spentData->filter(
function (TransactionJournal $model) use ($budget, $account) {
function (TransactionJournal $model) use ($account) {
return $model->account_id == $account->id && is_null($model->budget_id);
}
);