Merge branch 'hotfix/376' into develop

Forward port #376
zendframework · Aug 16, 2016 · 570f3e7 · 570f3e7
2 parents 95e6c38 + 8c26e1b
commit 570f3e7
Show file tree

Hide file tree

Showing 13 changed files with 86 additions and 75 deletions.
diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
@@ -20,7 +20,7 @@
         <!-- Scripts -->
         <?= $this->headScript()
             ->prependFile($this->basePath('js/bootstrap.min.js'))
-            ->prependFile($this->basePath('js/jquery-2.2.4.min.js'))
+            ->prependFile($this->basePath('js/jquery-3.1.0.min.js'))
         ?>
     </head>
     <body>

diff --git a/public/css/bootstrap-theme.css b/public/css/bootstrap-theme.css
diff --git a/public/css/bootstrap-theme.css.map b/public/css/bootstrap-theme.css.map
diff --git a/public/css/bootstrap-theme.min.css b/public/css/bootstrap-theme.min.css
diff --git a/public/css/bootstrap-theme.min.css.map b/public/css/bootstrap-theme.min.css.map
diff --git a/public/css/bootstrap.css b/public/css/bootstrap.css
diff --git a/public/css/bootstrap.css.map b/public/css/bootstrap.css.map
diff --git a/public/css/bootstrap.min.css b/public/css/bootstrap.min.css
diff --git a/public/css/bootstrap.min.css.map b/public/css/bootstrap.min.css.map