Skip to content
This repository was archived by the owner on Jan 1, 2020. It is now read-only.

Commit 625e7c5

Browse files
weierophinneyweierophinney
committed
Merge branch 'hotfix/376'
Close #376
2 parents 596bb94 + 8c26e1b commit 625e7c5

13 files changed

+86
-75
lines changed

‎module/Application/view/layout/layout.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<!-- Scripts -->
2121
<?= $this->headScript()
2222
->prependFile($this->basePath('js/bootstrap.min.js'))
23-
->prependFile($this->basePath('js/jquery-2.2.4.min.js'))
23+
->prependFile($this->basePath('js/jquery-3.1.0.min.js'))
2424
?>
2525
</head>
2626
<body>

‎public/css/bootstrap-theme.css‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/css/bootstrap-theme.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/css/bootstrap-theme.min.css‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/css/bootstrap-theme.min.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/css/bootstrap.css‎

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/css/bootstrap.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/css/bootstrap.min.css‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/css/bootstrap.min.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)