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

Fix PSR coding standards error #3658

Merged
merged 1 commit into from
Mar 24, 2014
Merged

Fix PSR coding standards error #3658

merged 1 commit into from
Mar 24, 2014

Conversation

ifdattic
Copy link
Contributor

Q A
Doc fix? yes
New docs? no
Applies to 2.3
Fixed tickets

@weaverryan
Copy link
Member

... and yet another perfect PR, except that this one no longer merges cleanly :). @ifdattic can you rebase for me?

Thanks!

@ifdattic
Copy link
Contributor Author

@weaverryan rebased, should work now

@wouterj
Copy link
Member

wouterj commented Mar 21, 2014

indeed, PR can now be merged

@weaverryan
Copy link
Member

Awesome, thanks Andrew!

weaverryan added a commit that referenced this pull request Mar 24, 2014
This PR was merged into the 2.3 branch.

Discussion
----------

Fix PSR coding standards error

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.3
| Fixed tickets |

Commits
-------

da2ee60 Fix PSR coding standards error
868de1e minor #3698 Dynamic form modification cookbook: Fix inclusion of code  (michaelperrin)
acf255d feature #3328 [WIP] Travis integration (WouterJ)
5d99d88 [#3697] Backporting 2.3-specific changes
1e8b0d4 Small fixes in code style
8093719 Dynamic form modification cookbook: Fix inclusion of code
37eb137 Update documentation
8dec729 sparse checkouts
b6f693e Added CMF
b1d9e62 Revert changes
6cad008 Updated travis config
c515613 Added .gitignore
85b1b02 Try to supress bundle doc warnings
f3cb8b1 Fixed submodules
71a2ff4 Added needed config files
d312683 Added sphinx files
@weaverryan weaverryan merged commit da2ee60 into symfony:2.3 Mar 24, 2014
@ifdattic ifdattic deleted the fix-psr branch March 24, 2014 19:16
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