aboutsummaryrefslogtreecommitdiffstats
path: root/railties/configs/apache.conf
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-07-31 16:35:58 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-07-31 16:35:58 -0700
commit46a458206f1117b87e672bc5aae046eaa832ee00 (patch)
treeb2692b98da56d23394605594c9dea5610719e7e0 /railties/configs/apache.conf
parenta540725f0d3439ea3b0f938d04ceed87d3690d9d (diff)
parent0b9bfbdebf402f4a149359a069dbeb05ea989b14 (diff)
downloadrails-46a458206f1117b87e672bc5aae046eaa832ee00.tar.gz
rails-46a458206f1117b87e672bc5aae046eaa832ee00.tar.bz2
rails-46a458206f1117b87e672bc5aae046eaa832ee00.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/configs/apache.conf')
-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