Skip to content

Commit

Permalink
Merge branch 'hotfix/1.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
cliffparnitzky committed Aug 1, 2017
2 parents bbd5fa2 + 440b6dc commit ae3eca3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ https://github.com/friends-of-contao/contao-php-info/issues
Compatibility
-------------

- min. Contao version: >= 3.2.0
- max. Contao version: < 3.6.0
- Contao version >= 3.2.0 ... < 3.6.0
- Contao version >= 4.4.0


Dependency
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
},
"require":{
"php":">=5.3",
"contao/core":">=3.2.0,<3.6",
"contao-community-alliance/composer-plugin":"~2.0"
"contao/core-bundle":"~3.2 || ~4.4",
"contao-community-alliance/composer-plugin":"~2.4 || ~3.0"
},
"conflict": {
"contao/core":"3.4.0,3.4.1,3.4.2"
Expand Down

0 comments on commit ae3eca3

Please sign in to comment.