Merge remote-tracking branch 'origin/master' into feature/cc-5750/mas…

…ter-decimal-stock # Conflicts: # Bundles/Availability/composer.json # Bundles/AvailabilityCartConnector/composer.json # Bundles/AvailabilityGui/composer.json # Bundles/AvailabilityOfferConnector/composer.json # Bundles/AvailabilityStorage/composer.json # Bundles/CartVariant/composer.json # Bundles/DiscountPromotion/composer.json # Bundles/Oms/composer.json # Bundles/ProductAvailabilitiesRestApi/composer.json # Bundles/ProductBundle/composer.json # Bundles/ProductManagement/composer.json # Bundles/ProductPackagingUnit/composer.json # Bundles/Stock/composer.json # Bundles/StockSalesConnector/composer.json # Bundles/Transfer/composer.json
spryker · Nov 15, 2019 · d48f016 · d48f016
2 parents d8d3f98 + d22d47d
commit d48f016
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: php
 dist: trusty
 
 php:
-    - 7.1
+    - 7.2
 
 cache:
     directories:

diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
   "description": "ProductDiscontinuedProductBundleConnector module",
   "license": "proprietary",
   "require": {
-    "php": ">=7.1",
+    "php": ">=7.2",
     "spryker/kernel": "^3.30.0",
     "spryker/product-bundle": "^2.0.0 || ^3.0.0 || ^4.0.0 || ^6.0.0 || ^7.0.0",
     "spryker/product-discontinued": "^1.1.0",