Skip to content

Commit

Permalink
Merge branch 'security/lp-2020-01' into develop
Browse files Browse the repository at this point in the history
Conflicts:
	CHANGELOG.md
  • Loading branch information
weierophinney committed Apr 1, 2020
2 parents e5cc783 + 4da80f5 commit 21813f1
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 25 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ All notable changes to this project will be documented in this file, in reverse

- Nothing.

## 1.4.1 - TBD
## 1.4.1 - 2020-04-01

### Added

Expand All @@ -44,7 +44,7 @@ All notable changes to this project will be documented in this file, in reverse

### Fixed

- Nothing.
- Provides fixes related to [security advisory LP-2020-01](https://getlaminas.org/security/advisory/LP-2020-01).

## 1.4.0 - 2018-05-03

Expand Down
2 changes: 1 addition & 1 deletion asset/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Laminas API Tools Assets
================
========================

This directory contains build tools and assets for the api-tools module. CSS
in this directory is primarily geared towards projects started with the
Expand Down
11 changes: 5 additions & 6 deletions asset/api-tools/css/bootstrap.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions asset/api-tools/js/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Files in this directory
=======================

- bootstrap.min.js: Minified version of the Bootstrap 3 javascript.
- jquery.min.js: Minified version of jquery 2.0.3
- bootstrap.min.js: Minified version of the Bootstrap 3.4.1 javascript.
- jquery.min.js: Minified version of jquery 2.2.4
9 changes: 4 additions & 5 deletions asset/api-tools/js/bootstrap.min.js

Large diffs are not rendered by default.

10 changes: 4 additions & 6 deletions asset/api-tools/js/jquery.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions asset/bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "api-tools",
"version": "0.9.0dev",
"version": "1.4.1",
"homepage": "https://api-tools.getlaminas.org",
"description": "Laminas API Tools Admin UI",
"keywords": [
Expand All @@ -16,8 +16,8 @@
"vendor"
],
"dependencies": {
"bootstrap": "~3.0.3",
"jquery": "~2.0.3",
"bootstrap": "~3.4.1",
"jquery": "~2.2.4",
"sass-bootstrap-glyphicons": "~1.0.0"
}
}

0 comments on commit 21813f1

Please sign in to comment.