Skip to content

Commit

Permalink
Merge pull request #93 from neos/master
Browse files Browse the repository at this point in the history
Merge 'master' into '7.0'
  • Loading branch information
albe authored Dec 11, 2020
2 parents 5a53c8b + b27c4aa commit 0dacd62
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"GPL-3.0-or-later"
],
"require": {
"neos/neos": "^6.0 || ^7.0 || dev-master",
"neos/neos": "^7.0 || dev-master",
"neos/fusion-afx": "*",
"neos/nodetypes-basemixins": "*",
"neos/nodetypes-assetlist": "*",
Expand Down

0 comments on commit 0dacd62

Please sign in to comment.