Skip to content

Fix build errors#3579

Merged
weaverryan merged 2 commits intosymfony:2.3from
xabbuh:issue-3544
Feb 16, 2014
Merged

Fix build errors#3579
weaverryan merged 2 commits intosymfony:2.3from
xabbuh:issue-3544

Conversation

@xabbuh
Copy link
Copy Markdown
Member

@xabbuh xabbuh commented Feb 13, 2014

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

This is a backport of #3544.

This was referenced Feb 13, 2014
@weaverryan
Copy link
Copy Markdown
Contributor

👍 thanks for this!

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

Discussion
----------

Fix build errors

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

This is a backport of #3544.

Commits
-------

3e0d1f4 remove empty_data from the list of inherited options, it's documented in the overriden options section
e702b34 fix referenced documents names
@weaverryan weaverryan merged commit 3e0d1f4 into symfony:2.3 Feb 16, 2014
@xabbuh xabbuh deleted the issue-3544 branch February 17, 2014 09:38
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.

2 participants