diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-04-22 15:26:03 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-04-22 15:26:03 +0100 |
| commit | 5f3f100ce2d689480da85abc88e5e940cf90189e (patch) | |
| tree | 15c1a05a5308a9eea56d7f0889ac46d9cac5b57c /activesupport/lib/active_support/vendor.rb | |
| parent | d758d996d1b66e2a65640f79f01ce2ac674d7ed5 (diff) | |
| parent | ca49299434bc764b667cd86846d892e91a150ef3 (diff) | |
| download | rails-5f3f100ce2d689480da85abc88e5e940cf90189e.tar.gz rails-5f3f100ce2d689480da85abc88e5e940cf90189e.tar.bz2 rails-5f3f100ce2d689480da85abc88e5e940cf90189e.zip | |
Merge branch 'master' into active_model
Conflicts:
activeresource/lib/active_resource/validations.rb
Diffstat (limited to 'activesupport/lib/active_support/vendor.rb')
| -rw-r--r-- | activesupport/lib/active_support/vendor.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/vendor.rb b/activesupport/lib/active_support/vendor.rb index 28852e65c8..2be9b85c89 100644 --- a/activesupport/lib/active_support/vendor.rb +++ b/activesupport/lib/active_support/vendor.rb @@ -6,7 +6,6 @@ begin rescue Gem::LoadError $:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2" end -require 'builder' begin gem 'memcache-client', '>= 1.6.5' |