Merge branch 'develop' of https://github.com/opensolutions/ViMbAdmin …

…into develop
ziegenberg · Feb 29, 2012 · fe30f5a · fe30f5a
2 parents 88505e4 + fd75a52
commit fe30f5a
Show file tree

Hide file tree

Showing 5 changed files with 1,204 additions and 4 deletions.
diff --git a/application/views/header.phtml b/application/views/header.phtml
@@ -32,7 +32,7 @@
     <script type="text/javascript" src="{genUrl}/js/910-vimbadmin.functions.js"></script>
     <script type="text/javascript" src="{genUrl}/js/990-vimbadmin.js"></script>
 {else}
-    <script type="text/javascript" src="{genUrl}/js/min.bundle-v4.js"></script>
+    <script type="text/javascript" src="{genUrl}/js/min.bundle-v5.js"></script>
 {/if}
 
 {if !$options.mini_css}
@@ -45,7 +45,7 @@
     <link rel="stylesheet" type="text/css" href="{genUrl}/css/895-bootstrap-override.css" />
     <link rel="stylesheet" type="text/css" href="{genUrl}/css/920-style.css" />
 {else}
-    <link rel="stylesheet" type="text/css" href="{genUrl}/css/min.bundle-v4.css" />
+    <link rel="stylesheet" type="text/css" href="{genUrl}/css/min.bundle-v5.css" />
 {/if}
 
 {if isset($inColorBox) && $inColorBox}

diff --git a/public/css/min.920-style.css b/public/css/min.920-style.css
diff --git a/public/css/min.bundle-v5.css b/public/css/min.bundle-v5.css
diff --git a/public/js/min.990-vimbadmin.js b/public/js/min.990-vimbadmin.js