Skip to content

Commit

Permalink
Merge pull request #9 from mostlyserious/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
mike-moreau authored Jul 19, 2024
2 parents f0ed163 + eec9b45 commit 3c1561e
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 6,953 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
.env
/node_modules
/vendor
/composer.lock
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Release Notes for Marker.io

## 2.1.1 - 2024-07-19

- Change useNativeScreenshot to be false by default
- Ensure project property is always a string
- Do not register javascript if project string is empty

## 2.1.0 - 2024-05-31

- Merge version 1.X changes into Craft 5 version.
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "proprietary",
"require": {
"php": ">=8.0.2",
"craftcms/cms": "^5.0.0"
"craftcms/cms": "^4.9.0||^5.0.0"
},
"require-dev": {
"craftcms/ecs": "dev-main",
Expand Down
Loading

0 comments on commit 3c1561e

Please sign in to comment.