Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feature/te-7546-fix…
Browse files Browse the repository at this point in the history
…-group-by/te-7547-fixes-and-tests
  • Loading branch information
AsonUnique committed Oct 29, 2020
2 parents bbb8f0b + 77d4e8c commit d677622
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 292 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
language: php

php:
- 7.2
- 7.3
- 7.4

matrix:
fast_finish: true

include:
- php: 7.2
- php: 7.3
env: PREFER_LOWEST=1

env:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ProductList Module
[![Build Status](https://travis-ci.org/spryker/product-list.svg)](https://travis-ci.org/spryker/product-list)
[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.2-8892BF.svg)](https://php.net/)
[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.3-8892BF.svg)](https://php.net/)

ProductList provides infrastructure and functionality to handle white/black lists of a concrete products for a specific merchants.

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "ProductList module",
"license": "proprietary",
"require": {
"php": ">=7.2",
"php": ">=7.3",
"spryker/cart-extension": "^1.5.0 || ^2.1.0 || ^4.0.0",
"spryker/category": "^3.0.0 || ^4.0.0",
"spryker/kernel": "^3.33.0",
Expand Down
Loading

0 comments on commit d677622

Please sign in to comment.