Manual Merge #472
Merged
Manual Merge #472
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…#457) * Update composer.json deps * Referencing templates using Twig namespaceв syntax * Use sonata templating service without activating framework.templating extension * Make sonata.block.templating.helper a regular service * Deprecation comments * Fix CS errors
* DevKit updates * Applied fixes from FlintCI (sonata-project#468)
kunicmarko20
force-pushed
the
master_stable
branch
3 times, most recently
from
b9a4857
to
ecbc1c1
Compare
src/Resources/config/block.xml
Outdated
| @@ -11,35 +11,35 @@ | |||
| <services> | |||
| <service id="sonata.block.service.container" class="%sonata.block.service.container.class%"> | |||
| <tag name="sonata.block"/> | |||
| <argument/> | |||
| <argument type="service" id="templating"/> | |||
| <argument>sonata.block.container</argument> | |||
kunicmarko20
force-pushed
the
master_stable
branch
from
ecbc1c1
to
f3a2978
Compare
greg0ire
approved these changes
Feb 1, 2018
jordisala1991
approved these changes
Feb 2, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Don't merge, just approve.