diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-26 13:05:08 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-26 13:05:08 -0700 |
| commit | 27d6ad899f594bd9b79e54cdc5a3c17110f3b26c (patch) | |
| tree | b75973ee4325bd11f27220e38d1e899076948c78 /config/deploy.rb | |
| parent | 9bbc93bfd8ba8aaaf9bd1ad9031368b7faad8239 (diff) | |
| parent | 3194a7801684d010dac94c26cf39bb780bfcd17e (diff) | |
Merge branch 'release/0.12'0.12
Conflicts:
locale/he_IL/app.po
locale/hr_HR/app.po
locale/nb_NO/app.po
locale/uk/app.po
Diffstat (limited to 'config/deploy.rb')
| -rw-r--r-- | config/deploy.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/deploy.rb b/config/deploy.rb index 5e660434a..3ce1a1969 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -50,6 +50,7 @@ namespace :deploy do "#{release_path}/config/general.yml" => "#{shared_path}/general.yml", "#{release_path}/config/rails_env.rb" => "#{shared_path}/rails_env.rb", "#{release_path}/config/newrelic.yml" => "#{shared_path}/newrelic.yml", + "#{release_path}/config/httpd.conf" => "#{shared_path}/httpd.conf", "#{release_path}/config/aliases" => "#{shared_path}/aliases", "#{release_path}/public/foi-live-creation.png" => "#{shared_path}/foi-live-creation.png", "#{release_path}/public/foi-user-use.png" => "#{shared_path}/foi-user-use.png", |