Merge branch 'feature.upgrade-jquery' of https://github.com/treffynnon/Indefero into develop

This commit is contained in:
Thomas Keller 2012-03-25 22:58:19 +02:00
commit d924c4e277
6 changed files with 8 additions and 8 deletions

View File

@ -31,7 +31,7 @@
<![endif]--> <![endif]-->
{block extraheader}{/block} {block extraheader}{/block}
<title>{block pagetitle}{$page_title|strip_tags}{/block}{if $project} - {$project.shortdesc}{/if}</title> <title>{block pagetitle}{$page_title|strip_tags}{/block}{if $project} - {$project.shortdesc}{/if}</title>
<script type="text/javascript" src="{media '/idf/js/jquery-1.7.1.min.js'}"></script> <script type="text/javascript" src="{media '/idf/js/jquery-1.7.2.min.js'}"></script>
{appversion} {appversion}
</head> </head>
<body> <body>

View File

@ -31,7 +31,7 @@
<![endif]--> <![endif]-->
{block extraheader}{/block} {block extraheader}{/block}
<title>{block pagetitle}{$page_title|strip_tags}{/block}</title> <title>{block pagetitle}{$page_title|strip_tags}{/block}</title>
<script type="text/javascript" src="{media '/idf/js/jquery-1.7.1.min.js'}"></script> <script type="text/javascript" src="{media '/idf/js/jquery-1.7.2.min.js'}"></script>
{appversion} {appversion}
</head> </head>
<body> <body>

View File

@ -31,7 +31,7 @@
<![endif]--> <![endif]-->
{block extraheader}{/block} {block extraheader}{/block}
<title>{block pagetitle}{$page_title|strip_tags}{/block}{if $project} - {$project.shortdesc}{/if}</title> <title>{block pagetitle}{$page_title|strip_tags}{/block}{if $project} - {$project.shortdesc}{/if}</title>
<script type="text/javascript" src="{media '/idf/js/jquery-1.7.1.min.js'}"></script> <script type="text/javascript" src="{media '/idf/js/jquery-1.7.2.min.js'}"></script>
{appversion} {appversion}
</head> </head>
<body> <body>

View File

@ -30,7 +30,7 @@
<![endif]--> <![endif]-->
{block extraheader}{/block} {block extraheader}{/block}
<title>{block pagetitle}{$page_title|strip_tags}{/block}</title> <title>{block pagetitle}{$page_title|strip_tags}{/block}</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.2.min.js'}"></script>
{appversion} {appversion}
</head> </head>
<body> <body>

File diff suppressed because one or more lines are too long

4
www/media/idf/js/jquery-1.7.2.min.js vendored Normal file

File diff suppressed because one or more lines are too long