Skip to content

Commit

Permalink
Merge branch 'develop' into USH-1387
Browse files Browse the repository at this point in the history
  • Loading branch information
Mh-Asmi committed Sep 10, 2024
2 parents 7c60d3d + 31d3923 commit f3d8e16
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 20 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"nyholm/psr7": "^1.5",
"ohanzee/database": "dev-namespaces",
"php-http/curl-client": "^2.2",
"predis/predis": "~1.1",
"predis/predis": "^2.2.2",
"robmorgan/phinx": "~0.11.2",
"sentry/sentry-laravel": "^1.9|^2.11",
"symfony/event-dispatcher": "^5.4",
Expand Down
31 changes: 13 additions & 18 deletions composer.lock

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

2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
ports:
- "33061:3306"
redis:
image: redis:4-alpine
image: redis:7.2-alpine
platform:
build: .
environment:
Expand Down

0 comments on commit f3d8e16

Please sign in to comment.