Merge branch 'hotfix/v-1.0.4'

Imanuel Ulbricht · Imanuel Ulbricht · commit 8f34362ff7b5 · 2014-11-27T15:27:09.000+01:00
diff --git a/app.js b/app.js
@@ -191,7 +191,7 @@ if ('development' == app.get('env')) {
     app.use(express.errorHandler());
 }
 
-var options = { pfx: fs.readFileSync('localhost.p12') }
+var options = { pfx: fs.readFileSync('server.p12') }
 
 var server = https.createServer(options, app)
 var io = require('socket.io')(server)

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ if ('development' == app.get('env')) {`
`191`	`191`	`app.use(express.errorHandler());`
`192`	`192`	`}`
`193`	`193`
`194`		`-var options = { pfx: fs.readFileSync('localhost.p12') }`
	`194`	`+var options = { pfx: fs.readFileSync('server.p12') }`
`195`	`195`
`196`	`196`	`var server = https.createServer(options, app)`
`197`	`197`	`var io = require('socket.io')(server)`