diff .svn/pristine/3c/3c16dbd6e7c58f730f5ff1711301f6b5ab6045e0.svn-base @ 926:b73a59a6acbd luisf

Merge from cannam_integration

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/3c/3c16dbd6e7c58f730f5ff1711301f6b5ab6045e0.svn-base	Fri May 11 16:10:11 2012 +0100
@@ -0,0 +1,16 @@
+# Settings specified here will take precedence over those in config/environment.rb
+
+# In the development environment your application's code is reloaded on
+# every request.  This slows down response time but is perfect for development
+# since you don't have to restart the webserver when you make code changes.
+config.cache_classes     = false
+
+# Log error messages when you accidentally call methods on nil.
+config.whiny_nils        = true
+
+# Show full error reports and disable caching
+config.action_controller.consider_all_requests_local = true
+config.action_controller.perform_caching             = false
+
+# Don't care if the mailer can't send
+config.action_mailer.raise_delivery_errors = false