aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-04-23 01:16:21 +0200
committerXavier Noria <fxn@hashref.com>2011-04-23 01:16:21 +0200
commit384dbfd1408721ded071a587b0dc9ee40203607e (patch)
tree770854b984691dea8187ca0a998a28e93a008093 /activesupport/lib/active_support.rb
parent900470cf3cd346ad1b17cf6902f3f98e6dae7709 (diff)
parentaf1b48926f49226c934995c322ee017239158cf3 (diff)
downloadrails-384dbfd1408721ded071a587b0dc9ee40203607e.tar.gz
rails-384dbfd1408721ded071a587b0dc9ee40203607e.tar.bz2
rails-384dbfd1408721ded071a587b0dc9ee40203607e.zip
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activesupport/lib/active_support.rb')
-rw-r--r--activesupport/lib/active_support.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 6b662ac660..6b87774978 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -42,7 +42,6 @@ module ActiveSupport
autoload :DescendantsTracker
autoload :FileUpdateChecker
- autoload :FileWatcher
autoload :LogSubscriber
autoload :Notifications