aboutsummaryrefslogtreecommitdiffstats
path: root/railties/configs
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2008-08-03 13:54:44 +0100
committerPratik Naik <pratiknaik@gmail.com>2008-08-03 13:54:44 +0100
commitf6124c2b09aed7b5951d0ac83438459c49757a36 (patch)
tree37ced4d11eafdb81f5173ae8b08e6124d3fee03c /railties/configs
parentacd0456fcf251d1e50cbf08311341dfd370dc1aa (diff)
parentcb21db1a334e6ca2695d4e7183b1bdce204b9eb3 (diff)
downloadrails-f6124c2b09aed7b5951d0ac83438459c49757a36.tar.gz
rails-f6124c2b09aed7b5951d0ac83438459c49757a36.tar.bz2
rails-f6124c2b09aed7b5951d0ac83438459c49757a36.zip
Merge commit 'mainstream/master'
Diffstat (limited to 'railties/configs')
-rw-r--r--[-rwxr-xr-x]railties/configs/apache.conf0
1 files changed, 0 insertions, 0 deletions
diff --git a/railties/configs/apache.conf b/railties/configs/apache.conf
index d9d211c058..d9d211c058 100755..100644
--- a/railties/configs/apache.conf
+++ b/railties/configs/apache.conf