Merge branch 'master' into openid

[rails.git] / config / environments / development.rb

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 7a7876f28105ba3c637da58e8dd4dd3c50169c00..d67452f0c8680c25376243a069ff3527582d7a31 100644 (file)
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -12,9 +12,6 @@ config.whiny_nils = true
 config.action_controller.consider_all_requests_local = true
 config.action_view.debug_rjs                         = true
 config.action_controller.perform_caching             = false
 config.action_controller.consider_all_requests_local = true
 config.action_view.debug_rjs                         = true
 config.action_controller.perform_caching             = false

-config.action_view.cache_template_extensions         = false

 
 # Don't care if the mailer can't send
 config.action_mailer.raise_delivery_errors = false
 
 # Don't care if the mailer can't send
 config.action_mailer.raise_delivery_errors = false

-
-ENV['RAILS_ASSET_ID'] = '' # http://wiki.openstreetmap.org/wiki/The_Rails_Port
\ No newline at end of file