Merge branch 'release/1.0.0' into develop

diff --git a/package.json b/package.json
index 0b50871dc6d1dd646a8bbb74fff017d035e68cad..4346199d58c90de237af0181e78576ef7b2526a2 100644 (file)
--- 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"
     }