Skip to content

MQE-1114: Merge the release branch to master #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 24, 2018
Merged

MQE-1114: Merge the release branch to master #180

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7645d64
MQE-1074: Verify MFTF Compatibility with Phpunit 7
KevinBKozan Jul 23, 2018
065b7a1
Merge pull request #179 from magento/MQE-1074
KevinBKozan Jul 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
MQE-1074: Verify MFTF Compatibility with Phpunit 7 
- Revert and lock codeception to 2.3.9
  • Loading branch information
@KevinBKozan
KevinBKozan committed Jul 23, 2018
commit 7645d643fadc6edc8597a1e122c9e0e0615d0e14
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0",
"allure-framework/allure-codeception": "~1.2.6",
"codeception/codeception": "~2.3.4 || ~2.4.0",
"codeception/codeception": "~2.3.4",
"consolidation/robo": "^1.0.0",
"epfremme/swagger-php": "^2.0",
"flow/jsonpath": ">0.2",
Expand Down
113 changes: 58 additions & 55 deletions composer.lock
View file
Open in desktop

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