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

This commit is contained in:
Raphael 2010-07-23 11:06:19 -07:00
commit 84b4d12e18
2 changed files with 2 additions and 2 deletions

View file

@ -29,7 +29,7 @@ Diaspora::Application.configure do
# Disable Rails's static asset server
# In production, Apache or nginx will already do this
config.serve_static_assets = false
config.serve_static_assets = true
# Enable serving of images, stylesheets, and javascripts from an asset server
# config.action_controller.asset_host = "http://assets.example.com"

View file

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