Merge v2.2.2 changes.

This commit is contained in:
Michael Teeuw
2018-01-02 18:46:41 +01:00
2 changed files with 331 additions and 15 deletions

View File

@@ -2,7 +2,15 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
<<<<<<< HEAD
## [2.3.0] - Unreleased
=======
## [2.2.2] - 2018-01-02
### Added
- Add missing `package-lock.json`.
>>>>>>> master
*This release is scheduled to be released on 2018-04-01.*