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

Updated README file with the new branch #1815

Merged
merged 2 commits into from Oct 23, 2012
Merged

Conversation

wouterj
Copy link
Member

@wouterj wouterj commented Oct 14, 2012

There is a new 2.1 branch for some months now, we should update the README file to include this branch (and new features).

There is a new `2.1` branch for some months now, we should update the README file to include this branch (and new features).
@weaverryan
Copy link
Member

@martinqt always base your changes off of 2.0 unless you're addressing a change (like a new feature) that's specific to 2.1 or master. If you're in doubt, don't worry too much about it :) - I can patch changes in quite easily, even if they are not against the correct branch.

@@ -7,8 +7,9 @@ Contributing
------------

>**Note**
>Unless you're documenting a feature that's new to Symfony 2.1, all pull
>requests must be based off of the **2.0** branch, **not** the master branch.
>Unless you're documenting a feature that's new to a subversion of Symfony 2,
Copy link
Member

Choose a reason for hiding this comment

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

change to

Unless you're documenting a feature that's new to a specific version of Symfony (e.g. Symfony 2.1),

Copy link
Member Author

Choose a reason for hiding this comment

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

Thank you, I've fixed this

@martinqt
Copy link

@weaverryan thanks. I think i'm indeed worying too much

weaverryan added a commit that referenced this pull request Oct 23, 2012
Updated README file with the new branch
@weaverryan weaverryan merged commit 54b2c85 into symfony:2.0 Oct 23, 2012
@weaverryan
Copy link
Member

Thanks @wouterj!

@wouterj wouterj deleted the patch-4 branch December 31, 2012 14:06
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.

None yet

3 participants