Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.json
  • Loading branch information
cristiano-pacheco committed Apr 11, 2023
2 parents 82338c9 + 7e6af6f commit 47271c0
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 59 deletions.
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "run-as-root/magento2-message-queue-retry",
"version": "1.1.0",
"description": "Provides message queue retry processing functionality via RabbitMQ's dead letter exchange.",
"type": "magento2-module",
"license": "MIT",
"version": "1.1.0",
"authors": [
{
"name": "Cristiano Pacheco",
Expand All @@ -12,12 +12,12 @@
],
"require": {
"php": "^8.1",
"magento/framework": ">=103.0.5",
"magento/module-backend": ">=102.0.5",
"magento/module-config": ">=101.2.5",
"magento/module-ui": ">=101.2.5",
"magento/framework": "~103.0.5",
"magento/module-backend": "~102.0.5",
"magento/module-config": "~101.2.5",
"magento/module-ui": "~101.2.5",
"php-amqplib/php-amqplib": "^v3.2.0",
"magento/framework-amqp": ">=100.4.3"
"magento/framework-amqp": "~100.4.3"
},
"require-dev": {
"phpunit/phpunit": "~9.5.20",
Expand Down
106 changes: 53 additions & 53 deletions composer.lock

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

0 comments on commit 47271c0

Please sign in to comment.