Merge branch 'master' into debugbar

2013-09-07 16:31:29 +02:00
parent 5315e13ce9 1c307385ce
commit ed468ccb67
70 changed files with 2294 additions and 991 deletions
--- a/templates/admin/default/admin-layout.tpl
+++ b/templates/admin/default/admin-layout.tpl
@@ -212,9 +212,7 @@

 	{block name="before-javascript-include"}{/block}

-	{javascripts file='assets/js/jquery.min.js'}
-	    <script src="{$asset_url}"></script>
-	{/javascripts}
+	<script src="http://code.jquery.com/jquery-2.0.3.min.js"></script>

 	{block name="after-javascript-include"}{/block}