diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-09-14 19:52:32 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-09-14 19:52:32 +0200 |
| commit | b2e02ebf873d5045f91ec71091a556a21501c5fe (patch) | |
| tree | bf235094127aa040c1cdb35af1afbd94fe0f684f /app/App_FrontController.php | |
| parent | 73fe0eabbe4461ba8c6d24692ca05de0ac93de11 (diff) | |
| parent | f897d64f1c82d3903ae3d70e4935360c701f6329 (diff) | |
Merge branch 'jquery' of https://github.com/Alkarex/FreshRSS into Alkarex-jquery
Conflicts:
app/views/javascript/main.phtml
Diffstat (limited to 'app/App_FrontController.php')
| -rw-r--r-- | app/App_FrontController.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/App_FrontController.php b/app/App_FrontController.php index 2a2684412..9eb3b5e1d 100644 --- a/app/App_FrontController.php +++ b/app/App_FrontController.php @@ -57,8 +57,8 @@ class App_FrontController extends FrontController { if (login_is_conf ($this->conf)) { View::appendScript ('https://login.persona.org/include.js'); } - View::appendScript (Url::display ('/scripts/jquery.js')); - View::appendScript (Url::display ('/scripts/jquery.lazyload.min.js')); + View::appendScript (Url::display ('/scripts/jquery.min.js')); + View::appendScript (Url::display ('/scripts/jquery.lazyload.min.js')); //TODO: Load only if used View::appendScript (Url::display ('/scripts/notification.js')); } |