Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/composer/phpstan/phpstan-0.12.94
Browse files Browse the repository at this point in the history
  • Loading branch information
macbre committed Aug 3, 2021
2 parents bc8d102 + 3a395e5 commit eef1896
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"ext-gd": "*",
"ext-xml": "*",
"predis/predis": "^1.1",
"monolog/monolog": "2.3.1",
"monolog/monolog": "2.3.2",
"macbre/monolog-utils": "^2.1",
"tedivm/jshrink": "^1.2",
"phpunit/phpunit": "9.x"
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 eef1896

Please sign in to comment.