Merge branch 'develop' of projects.ceondo.com:indefero into feature.scilab

Conflicts: NEWS.mdtext
2012-03-22 00:51:39 +01:00
parent 562e6803c5 be2f0b3d62
commit f8a830802e
12 changed files with 120 additions and 163 deletions
--- a/src/IDF/templates/idf/base.html
+++ b/src/IDF/templates/idf/base.html
@@ -31,7 +31,7 @@
  <![endif]-->
  {block extraheader}{/block}
  <title>{block pagetitle}{$page_title|strip_tags}{/block}{if $project} - {$project.shortdesc}{/if}</title>
-  <script type="text/javascript" src="{media '/idf/js/jquery-1.2.6.min.js'}"></script>
+  <script type="text/javascript" src="{media '/idf/js/jquery-1.7.1.min.js'}"></script>
  {appversion}
 </head>
 <body>