Skip to content

Commit 4020bf9

Browse files
authored
Merge pull request #23 from axa-group/poveden/npmupdate
Poveden/npmupdate
2 parents 57b388b + dca0a5b commit 4020bf9

File tree

5 files changed

+1763
-1014
lines changed

5 files changed

+1763
-1014
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
66

7+
## [1.1.5](https://github.com/axa-group/arm-template-merge/compare/v1.1.4...v1.1.5) — 2020-04-06
8+
9+
### Security
10+
11+
- Update `npm` dependencies to fix:
12+
- [CVE-2020-7598](https://github.com/advisories/GHSA-vh95-rmgr-6w4m)
13+
- [CVE-2019-20149](https://github.com/advisories/GHSA-6c8f-qphg-qjgp)
14+
715
## [1.1.4](https://github.com/axa-group/arm-template-merge/compare/v1.1.3...v1.1.4) — 2019-10-10
816

917
### Security

bin/arm-template-merge

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const fs = require('fs');
1919
const path = require('path');
2020
const util = require('util');
2121
const fg = require('fast-glob');
22-
const mergeARMTemplates = require('../');
22+
const mergeARMTemplates = require('..');
2323

2424
const readFile = util.promisify(fs.readFile);
2525
const writeFile = util.promisify(fs.writeFile);

0 commit comments

Comments
 (0)