Merge branch 'master' into develop

Maples7 · Apr 7, 2017 · 30db2b2 · 30db2b2
2 parents 77a4958 + 0446b4f
commit 30db2b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -89,7 +89,7 @@ POST /api/v1/weibos/:id
 DELETE /api/v1/weibos/temp
 ```
 
-You are welcomed to review _test.js_ and _controllers_ dir in this project for more infomation of usage.
+You are welcomed to review _test.js_ and _controllers_ dir in this project for more information of usage.
 
 ## LICENSE
-[MIT](LICENSE)
+[MIT](LICENSE)
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "nyc": "^10.1.2",
     "supertest": "^3.0.0"
   },
-  "engines" : { 
-    "node" : ">=6.1.0" 
+  "engines": { 
+    "node": ">=6.1.0" 
   } 
 }