Commit de50b300 authored by yPhil's avatar yPhil

Merge branch 'mastodon'

parents 6d20792c f2099f1a
......@@ -84,14 +84,14 @@ router.get('/feed', function(req, res) {
getFeed(req.query.feedurl, function (err, feedItems, feedTitle, feedLink) {
if (feedItems) {
return res.send({
feedItems: feedItems,
feedLink: feedLink,
feedTitle: feedTitle
// res.end();
} else {
return 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