Skip to content

Commit

Permalink
Merge pull request #19618 from akeneo/pull-70-into-master
Browse files Browse the repository at this point in the history
Pull up 7.0 into master
  • Loading branch information
antoinearrive committed Apr 18, 2023
2 parents 577212d + de2dca7 commit c285222
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG-6.0.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# 6.0.x

# 6.0.80 (2023-04-11)

## Bug fixes

- PIM-10922: Update dompdf library

# 6.0.79 (2023-04-04)

# 6.0.78 (2023-03-29)

## Bug fixes
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"doctrine/migrations": "^3.1.4",
"doctrine/orm": "^2.9.0",
"doctrine/persistence": "^2.2.3",
"dompdf/dompdf": "^2.0.1",
"dompdf/dompdf": "2.0.3",
"elasticsearch/elasticsearch": "7.11.0",
"friendsofsymfony/jsrouting-bundle": "3.2.1",
"friendsofsymfony/rest-bundle": "^3.4.0",
Expand Down
14 changes: 7 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c285222

Please sign in to comment.