Permalink
Browse files

Merge branches 'HEAD' and 'coffecup'

  • Loading branch information...
2 parents 4c60672 + 9bfdac1 commit 401f0723ba1bb4f01ca14ce53ae1edc2d7e2af1a @shimaore shimaore committed Apr 18, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/zappa.coffee
View
@@ -115,7 +115,7 @@ zappa.app = (func) ->
# Zappa's default settings.
app.set 'view engine', 'coffee'
- app.register '.coffee', zappa.adapter require('coffeekup').adapters.express,
+ app.register '.coffee', zappa.adapter require('coffeecup').adapters.express,
blacklist: ['format', 'autoescape', 'locals', 'hardcode', 'cache']
# Sets default view dir to @root (`path.dirname(module.parent.filename)`).

0 comments on commit 401f072

Please sign in to comment.