Merge branch 'apelsophiebarat-hotfix/issue-25'

Conflicts:
	package.json
This commit is contained in:
Dylan Greene committed 2014-01-28 10:41:37 -05:00
commit 20af9eb5e2
2 files changed
+22 -2

No files matched your search

+3 -1
View File
@@ -28,7 +28,9 @@
},
"devDependencies": {
"chai": "~1.8.1",
"mocha": "~1.17.0"
"mocha": "~1.17.0",
"xml2js": "~0.4.1",
"q": "~1.0.0"
},
"main": "lib/rss.js",
"scripts": {