Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare for 1.1 release #10

Merged
merged 2 commits into from
Aug 18, 2016
Merged

Prepare for 1.1 release #10

merged 2 commits into from
Aug 18, 2016

Conversation

Nyholm
Copy link
Contributor

@Nyholm Nyholm commented Aug 6, 2016

Also fixed syntax

Also fixed syntax
@Nyholm Nyholm mentioned this pull request Aug 6, 2016
@webmozart
Copy link
Member

Saw this too late. Could you rebase this PR on master?

@webmozart
Copy link
Member

ping @Nyholm

@Nyholm
Copy link
Contributor Author

Nyholm commented Aug 18, 2016

Updated

@@ -10,7 +10,7 @@
}
],
"require": {
"php": "^5.3.3|^7.0"
"php": "^5.3.3 || ^7.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the difference?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

new syntax vs old syntax. See the last example: https://getcomposer.org/doc/04-schema.md#package-links

@webmozart webmozart merged commit 8444f2a into webmozarts:master Aug 18, 2016
@Nyholm Nyholm deleted the patch-1 branch August 18, 2016 09:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants