scores/extranet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correction rebase

Browse Source
This commit is contained in:
Michael RICOIS 2016-04-20 15:39:27 +02:00
parent cbc6bc50d7
commit e336c7919d
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/Application/Controller/Plugin/Theme.php
View File

@ -101,14 +101,8 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
$view->headScript()
->appendFile('/libs/html5shiv.min.js', 'text/javascript', array('conditional' => 'lt IE 9'))
->appendFile('/libs/respond.min.js', 'text/javascript', array('conditional' => 'lt IE 9'))
<<<<<<< Upstream, based on master
->appendFile('/libs/bootstrap-3.3.6/js/bootstrap.min.js', 'text/javascript')
->appendFile('/libs/jquery/jquery-1.12.3.min.js', 'text/javascript');
=======
->appendFile('/libs/jquery/jquery-1.12.1.min.js', 'text/javascript')
->appendFile('/libs/jquery/jquery-1.12.3.min.js', 'text/javascript')
->appendFile('/libs/bootstrap-3.3.6/js/bootstrap.min.js', 'text/javascript');
>>>>>>> 6ae97d6 Effet de style
if ( $UserLogin ) {
$view->headScript()