Skip to content

Commit

Permalink
Merge branch '2.x' into deprec-sync
Browse files Browse the repository at this point in the history
  • Loading branch information
dbu authored Apr 14, 2023
2 parents 692eb01 + 259f4d3 commit 785c0b7
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 26 deletions.
19 changes: 0 additions & 19 deletions .github/workflows/checks.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI
on:
push:
branches:
- master
- '*.x'
pull_request:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Static analysis
on:
push:
branches:
- master
- '*.x'
pull_request:

jobs:
Expand Down
5 changes: 0 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@
"friends-of-phpspec/phpspec-code-coverage": "^4.1 || ^5.0 || ^6.0",
"phpspec/phpspec": "^5.1 || ^6.0 || ^7.0"
},
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
}
},
"autoload": {
"psr-4": {
"Http\\Client\\": "src/"
Expand Down

0 comments on commit 785c0b7

Please sign in to comment.