Skip to content
Permalink
Browse files

Merge branch 'b-6.x'

# Conflicts:
#	composer.json
  • Loading branch information...
MantasVaitkunas committed Jul 10, 2019
2 parents 4d11268 + bdf04c1 commit 89012427a2af22bb8efcd8918d13287a0ce7943d
Showing with 1 addition and 1 deletion.
  1. +1 −1 composer.json
@@ -32,7 +32,7 @@
"oxid-esales/oxideshop-composer-plugin": "dev-master",
"oxid-esales/oxideshop-unified-namespace-generator": "^2.0.0",
"oxid-esales/testing-library": "dev-master",
"oxid-esales/coding-standards-wrapper": "v2.0.0",
"oxid-esales/coding-standards-wrapper": "^v2.0.0",
"incenteev/composer-parameter-handler": "~v2.0",
"oxid-esales/oxideshop-ide-helper": "^3.0",
"oxid-esales/azure-theme": "^v1.4.1",

0 comments on commit 8901242

Please sign in to comment.
You can’t perform that action at this time.