Merge branch 'master' of github.com:diaspora/diaspora_rails

This commit is contained in:
maxwell 2010-06-22 16:12:56 -07:00
commit 56e940131f
2 changed files with 20 additions and 20 deletions

View file

@ -7,7 +7,7 @@ max_conns: 1024
require: []
max_persistent_conns: 512
environment: production
environment: development
servers: 1
daemonize: true
#chdir: /usr/applications/localhash/current