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

This commit is contained in:
maxwell 2010-06-22 10:42:45 -07:00
commit 9c1619059b

View file

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