Skip to content

Commit

Permalink
Merge remote-tracking branch 'os/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.json
  • Loading branch information
Steveb-p committed Oct 13, 2020
2 parents fe5713f + e97db3c commit 664465d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
"ezsystems/ezplatform-user": "^2.2@dev",
"ezsystems/ezplatform-version-comparison": "^1.2@dev",
"ezsystems/ezplatform-workflow": "^2.2@dev",
"friendsofsymfony/jsrouting-bundle": "^2.5",
"friendsofsymfony/jsrouting-bundle": "^2.5.1",
"gregwar/captcha-bundle": "^2.0",
"hautelook/templated-uri-bundle": "^3.2",
"hautelook/templated-uri-bundle": "^3.3",
"knplabs/knp-menu-bundle": "^3.0",
"lexik/jwt-authentication-bundle": "^2.6",
"monolog/monolog": "^2.0",
Expand Down

0 comments on commit 664465d

Please # to comment.