Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/cake4'
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
#	composer.json
  • Loading branch information
dereuromark committed Nov 9, 2023
2 parents 647e390 + 098dcd2 commit 0093e9f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: CI

on:
push:
branches:
- master
pull_request:
workflow_dispatch:

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
phpunit.phar
.phpunit.result.cache
/.phpunit.cache/
vendor/
tmp/
composer.lock
Expand Down

0 comments on commit 0093e9f

Please sign in to comment.