diff options
| author | Mark Longair <mhl@pobox.com> | 2013-11-15 11:39:12 +0000 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-11-15 11:39:12 +0000 |
| commit | 64618741c17760fcb59647d74d1ccaff56160b15 (patch) | |
| tree | d84f1f035b136180f0bdacb22895fbb0f1abf2c1 /lib/configuration.rb | |
| parent | 96b3b5adbdafb25e5ab6ca94b89d6682a2e8f0e4 (diff) | |
| parent | cda26c36f309cdd8e8bbab9186f6cc0d4876e6c9 (diff) | |
Merge branch 'release/0.15' into wdtk
Conflicts:
lib/tasks/stats.rake
Diffstat (limited to 'lib/configuration.rb')
| -rw-r--r-- | lib/configuration.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/configuration.rb b/lib/configuration.rb index ab985c8bf..fba70f27c 100644 --- a/lib/configuration.rb +++ b/lib/configuration.rb @@ -69,6 +69,7 @@ module AlaveteliConfiguration :TWITTER_WIDGET_ID => false, :USE_DEFAULT_BROWSER_LANGUAGE => true, :USE_GHOSTSCRIPT_COMPRESSION => false, + :USE_MAILCATCHER_IN_DEVELOPMENT => true, :UTILITY_SEARCH_PATH => ["/usr/bin", "/usr/local/bin"], :VARNISH_HOST => '', :WORKING_OR_CALENDAR_DAYS => 'working', |