Merged development into master

This commit is contained in:
NelsonLaQuet 2013-09-01 03:54:08 -05:00
commit 4070aca54a

View file

@ -123,7 +123,7 @@
new FileAsset('styles/base/colorbox.css'), new FileAsset('styles/base/colorbox.css'),
new FileAsset('styles/app.less'), new FileAsset('styles/app.less'),
new CacheBusterAsset($lastModifiedCollection->getLastModified()) new CacheBusterAsset($lastModifiedCollection->getLastModified())
], [new \Assetic\Filter\LessFilter('node')]); ], [new \Assetic\Filter\LessFilter('node', Config::get('app.node_paths'))]);
if (Config::get('app.debug')) { if (Config::get('app.debug')) {
$css->add(new FileAsset('styles/profiler.less')); $css->add(new FileAsset('styles/profiler.less'));