Merged with master

2016-02-09 10:23:55 +01:00
parent 307a5d8157
commit 7fa4b3bc07
57 changed files with 325 additions and 109 deletions
--- a/bin/parse-server
+++ b/bin/parse-server
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 var express = require('express');
-var ParseServer = require("../index").ParseServer;
+var ParseServer = require("../lib/index").ParseServer;

 var app = express();