From: Rob Allen Date: Wed, 17 Oct 2012 11:44:08 +0000 (+0100) Subject: Merge remote-tracking branch 'EvanDotPro/feature/updates' X-Git-Url: http://git.inspyration.org/?p=zf2.biz%2Fgalerie.git;a=commitdiff_plain;h=eeca1312c122af647125517214216d2a4da0c2da;hp=98c1354a1bc8ddad205e65f03fa9c8354fdea28b Merge remote-tracking branch 'EvanDotPro/feature/updates' --- diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml index 18a4720..6efc267 100644 --- a/module/Application/view/layout/layout.phtml +++ b/module/Application/view/layout/layout.phtml @@ -15,10 +15,12 @@ headScript()->prependFile($this->basePath() . '/js/html5.js', 'text/javascript', array('conditional' => 'lt IE 9',)) - ->prependFile('//ajax.googleapis.com/ajax/libs/jquery/1.8/jquery.min.js') ?> + ->prependFile($this->basePath() . '/js/bootstrap.min.js') + ->prependFile($this->basePath() . '/js/jquery.min.js') ?> + -