Merge branch 'copyright'

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 724ceebbb85f241695c2d63d3d4c9b5a5761eba0..539af83b2971842a09296fe6456493c4c79e3571 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -54,9 +54,6 @@ Rails::Initializer.run do |config|
   config.gem 'httpclient'
   config.gem 'SystemTimer', :version => '>= 1.1.3', :lib => 'system_timer'
   config.gem 'sanitize'
-  if Rails.env == "development"
-    config.gem 'timecop'
-  end
 
   # Only load the plugins named here, in the order given. By default, all plugins
   # in vendor/plugins are loaded in alphabetical order.