From: Matthew Weier O'Phinney Date: Wed, 3 Oct 2012 20:54:41 +0000 (-0500) Subject: Merge branch 'patch-2' of https://github.com/BinaryKitten/ZendSkeletonApplication... X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=f87fbac1a907800df169dae3ddc2445f8a618e08;hp=d74feaa364a5552db7ab0b2727cb562727e921b9;p=zf2.biz%2Fapplication_blanche.git Merge branch 'patch-2' of https://github.com/BinaryKitten/ZendSkeletonApplication into hotfix/132 --- diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml index 52285ec..18a4720 100644 --- a/module/Application/view/layout/layout.phtml +++ b/module/Application/view/layout/layout.phtml @@ -15,7 +15,7 @@ headScript()->prependFile($this->basePath() . '/js/html5.js', 'text/javascript', array('conditional' => 'lt IE 9',)) - ->prependFile($this->basePath() . '/js/jquery-1.7.2.min.js') ?> + ->prependFile('//ajax.googleapis.com/ajax/libs/jquery/1.8/jquery.min.js') ?>