Commit 8c727ab9 authored by yPhil's avatar yPhil

Merge branch 'current'

parents 84dc2c9f a6630837
......@@ -14,9 +14,9 @@
"scripts": {
"start": "pm2 start pm2.config.json",
"restart": "pm2 restart pm2.config.json",
"stop": "pm2 stop petrolette",
"show": "pm2 show petrolette",
"logs": "pm2 logs petrolette",
"stop": "pm2 stop ptl",
"show": "pm2 show ptl",
"logs": "pm2 logs ptl",
"postinstall": "bower install"
},
"dependencies": {
......
{
"apps" : [{
"name" : "petrolette",
"name" : "ptl",
"script" : "./bin/www",
"watch" : true,
"ignore_watch" : ["#*", "favicons-cache", ".git", "node_modules"],
......
......@@ -148,7 +148,7 @@ router.get('/feed', function(req, res) {
feedLink: feedLink,
feedTitle: feedTitle
});
return;
// return;
} else if (!res.headersSent) {
res.send({error:err});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment