Merge branch 'master' into patch-1

2016-03-10 16:24:22 +05:30
parent bb5cd080bc f08b0b32bb
commit dc0e8ebe9a
9 changed files with 129 additions and 33 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "parse-server",
-  "version": "2.1.4",
+  "version": "2.1.5",
  "description": "An express module providing a Parse-compatible API server",
  "main": "lib/index.js",
  "repository": {