Skip to content

Commit 1f39f19

Browse files
authored
Merge pull request #11 from axa-group/poveden/v1.1.0
Version 1.1.0
2 parents 7dbc0eb + 5eca567 commit 1f39f19

File tree

4 files changed

+1638
-2515
lines changed

4 files changed

+1638
-2515
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@ 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-
## [Unreleased](https://github.com/axa-group/arm-template-merge/compare/v1.0.0...HEAD)
7+
## [1.1.0](https://github.com/axa-group/arm-template-merge/compare/v1.0.0...v1.1.0) — 2019-03-18
88

99
### Added
1010

1111
- Add changelog
1212
- Add stripping of UTF-8 BOM on input files
1313

14+
### Changed
15+
16+
- Reduce merge code complexity
17+
1418
### Security
1519

1620
- Update `npm` dependencies to fix [CVE-2018-16469](https://nvd.nist.gov/vuln/detail/CVE-2018-16469)

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ npm install -g arm-template-merge
2727

2828
Then run `arm-template-merge` without any arguments for details on its utilization.
2929

30+
Alternatively, you can execute the CLI without installing it by running:
31+
32+
```shell
33+
npx arm-template-merge
34+
```
35+
3036
### Adding it as a dependency
3137

3238
You may add it to your project as a dependency:

0 commit comments

Comments
 (0)