Merge branch 'release/2.0.0' into develop

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87ecdd644f4ad8484e111c5a19732b23988d973d..890dcac9edb67aa2eb6e92406b4e58ae9af83ea3 100644 (file)
--- 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 a2d252168a2645a0ac7d00ffefd06209fa587003..e43da442c260d357bf9acee030e3c9f984faccad 100644 (file)
--- 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",