diff options
| author | Ben Beltran <ben@nsovocal.com> | 2017-04-12 00:22:57 -0500 |
|---|---|---|
| committer | Ben Beltran <ben@nsovocal.com> | 2017-04-12 00:22:57 -0500 |
| commit | b58bb0a6b290c8afe6d219897a547fa087b279d2 (patch) | |
| tree | f95798bb6a0e62d39e4f9a8c234791fd3971a6f3 | |
| parent | b3b840f89948d96aa28760fc5cf41c384488f6a6 (diff) | |
| parent | 100b8422835fc876c8cff2c2960b63e95a01b744 (diff) | |
Merge branch 'release/2.0.0' into developfeature/rbdr-update-dependencies
| -rw-r--r-- | CHANGELOG.md | 10 | ||||
| -rw-r--r-- | package.json | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 87ecdd6..890dcac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,21 +4,18 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). -## [Unreleased] - 2017-04-10 +## [2.0.0] - 2017-04-12 ### Added - Adds hapi eslint config -- Adds travis +- Adds travis integration - This CHANGELOG - A contributing file -- Uses webpack to generate the bundle ### Changed +- Uses webpack to generate the bundle - Converts tests to lab - Converts to use only commonJS -### Removed -- Dist files - ## [1.0.0] - 2016-03-28 ### Changed - Converts to ES6 @@ -57,3 +54,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/). [v0.1.6]: https://github.com/serpentity/serpentity/compare/v0.1.5...v0.1.6 [v0.1.7]: https://github.com/serpentity/serpentity/compare/v0.1.6...v0.1.7 [1.0.0]: https://github.com/serpentity/serpentity/compare/v0.1.7...1.0.0 +[2.0.0]: https://github.com/serpentity/serpentity/compare/1.0.0...2.0.0 diff --git a/package.json b/package.json index a2d2521..e43da44 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@serpentity/serpentity", "description": "An Entity-Component-System Engine", - "version": "2.0.0-alpha2", + "version": "2.0.0", "contributors": [ { "name": "Rubén Beltrán del Río", |