Merge branch '3.8'

Conflicts:
	composer.lock
	templates/mobile/common/index.html.twig
This commit is contained in:
Romain Neutron
2013-09-05 13:57:42 +02:00
20 changed files with 382 additions and 285 deletions

View File

@@ -41,7 +41,10 @@ class module_console_systemClearCache extends Command
->exclude('.svn')
->in(array(
$this->container['root.path'] . '/tmp/cache_minify/',
$this->container['root.path'] . '/tmp/cache_twig/'
$this->container['root.path'] . '/tmp/cache_twig/',
$this->container['root.path'] . '/tmp/cache/profiler/',
$this->container['root.path'] . '/tmp/doctrine/',
$this->container['root.path'] . '/tmp/serializer/',
));
$filesystem = new Filesystem();