merge conflcit

This commit is contained in:
barisusakli
2014-08-15 18:16:45 -04:00

View File

@@ -58,7 +58,7 @@
"validator": "~3.16.1",
"winston": "~0.7.2",
"xregexp": "~2.0.0",
"templates.js": "0.0.10"
"templates.js": "0.0.12"
},
"devDependencies": {
"mocha": "~1.13.0"