From: Ben Beltran <redacted>
Date: Mon, 28 Mar 2016 06:11:19 +0000 (-0600)
Subject: Merge branch 'release/1.0.0' into develop
X-Git-Tag: 2.0.0~1^2
X-Git-Url: https://git.r.bdr.sh/rbdr/serpentity/commitdiff_plain/d071276e2426c4180e44debe8b92ad16cbbc414f?hp=8af8134e5727b9943ff6261175cf35c311f1ad23

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

diff --git a/package.json b/package.json
index 0b50871..4346199 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "serpentity",
   "description": "A simple entity framework inspired by ash",
-  "version": "1.0.0-alpha1",
+  "version": "1.0.0",
   "contributors": [
     {
-      "name": "Ben Beltran",
+      "name": "Rubén Beltrán del Río",
       "email": "ben@nsovocal.com",
       "url": "http://nsovocal.com"
     }