Skip to content
This repository has been archived by the owner on Apr 4, 2019. It is now read-only.

Cache updates #42

Merged
merged 9 commits into from
Mar 7, 2013
Merged

Cache updates #42

merged 9 commits into from
Mar 7, 2013

Conversation

andrerom
Copy link
Contributor

@andrerom andrerom commented Mar 7, 2013

No description provided.

Updates Symfony to 2.2.

Conflicts:
	composer.json
	composer.lock
	src/EzSystems/DemoBundle/Resources/views/pagelayout.html.twig
Conflicts:
	composer.json
	composer.lock
And change branch of ezpublish-kernel now that it is merged in.

Conflicts:
	composer.json
	composer.lock
@lolautruche
Copy link
Contributor

+1

andrerom added a commit that referenced this pull request Mar 7, 2013
Merge in cache fixes to get repo working with the cache feature.
NB: You'll need to either regenerate your config, copy over stash config from ezpublish_setup.yml or see doc on which will be available soon on https://confluence.ez.no/display/EZP/Persistence+cache
@andrerom andrerom merged commit 6eb6586 into master Mar 7, 2013
@andrerom andrerom deleted the cache branch March 7, 2013 11:14
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants