Solve conflict

This commit is contained in:
Henrik Raitasola
2018-01-06 15:26:38 +02:00
6 changed files with 125 additions and 77 deletions

View File

@@ -2,22 +2,28 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
## [2.2.3] - 2018-01-06
## [2.3.0] - Unreleased
### Added
- Add system notification `MODULE_DOM_CREATED` for notifying each module when their Dom has been fully loaded.
- Add types for module.
*This release is scheduled to be released on 2018-04-01.*
## [2.2.2] - 2018-01-02
### Added
- Add missing `package-lock.json`.
### Changed
- Changed Electron dependency to v1.7.10.
## [2.2.1] - 2018-01-01
### Fixed
- Fixed linting errors.
## [2.2.0] - 2018-01-01