Merge branch 'origin-develop'

This commit is contained in:
Tyler Renelle 2013-03-08 14:33:40 -05:00
commit 5c7fdc7ff5

View file

@ -17,5 +17,5 @@ module.exports.view = (req, res, next) ->
module.exports.allowCrossDomain = (req, res, next) -> module.exports.allowCrossDomain = (req, res, next) ->
res.header "Access-Control-Allow-Origin", '*' res.header "Access-Control-Allow-Origin", '*'
res.header "Access-Control-Allow-Methods", "GET,PUT,POST,DELETE" res.header "Access-Control-Allow-Methods", "GET,PUT,POST,DELETE"
res.header "Access-Control-Allow-Headers", "Content-Type,x-requested-with" res.header "Access-Control-Allow-Headers", "Content-Type,x-requested-with,x-api-user,x-api-key"
next() next()