Skip to content

Commit

Permalink
Merge branch '4.2-dev' into j4/users/view-db
Browse files Browse the repository at this point in the history
  • Loading branch information
laoneo committed Apr 22, 2022
2 parents 072b822 + 62053cc commit 2d67451
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -102,7 +102,7 @@
"joomla/coding-standards": "~3.0@dev",
"friendsofphp/php-cs-fixer": "^3.0",
"squizlabs/php_codesniffer": "~3.0",
"joomla-projects/joomla-browser": "~4.0@dev",
"joomla-projects/joomla-browser": "~4.0",
"codeception/codeception": "~4.0",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"joomla/mediawiki": "^1.0",
Expand Down
17 changes: 8 additions & 9 deletions composer.lock

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

0 comments on commit 2d67451

Please sign in to comment.