From: Ben Beltran <redacted>
Date: Wed, 12 Apr 2017 05:22:57 +0000 (-0500)
Subject: Merge branch 'release/2.0.0' into develop
X-Git-Tag: 3.0.0^2~9
X-Git-Url: https://git.r.bdr.sh/rbdr/serpentity/commitdiff_plain/b58bb0a6b290c8afe6d219897a547fa087b279d2?hp=b3b840f89948d96aa28760fc5cf41c384488f6a6

Merge branch 'release/2.0.0' into develop
---

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",