diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-10-08 15:05:18 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-10-08 15:05:18 -0300 |
| commit | 0cf4662ec589813c4fdc22de3398730cab05c5ed (patch) | |
| tree | d422b8d8e4ccccf9bd89443b82398e1d7313269f /activesupport/lib/active_support/core_ext/string.rb | |
| parent | c3f9d51a00b9e7e5f5d14e7464fae04c48198756 (diff) | |
| parent | 665c7ad29d5614b8f5535d317f1dd2803ddcaa7d (diff) | |
| download | rails-0cf4662ec589813c4fdc22de3398730cab05c5ed.tar.gz rails-0cf4662ec589813c4fdc22de3398730cab05c5ed.tar.bz2 rails-0cf4662ec589813c4fdc22de3398730cab05c5ed.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activesupport/lib/active_support/core_ext/string.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/string.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/string.rb b/activesupport/lib/active_support/core_ext/string.rb index d06a5a32fb..6c52f12712 100644 --- a/activesupport/lib/active_support/core_ext/string.rb +++ b/activesupport/lib/active_support/core_ext/string.rb @@ -7,4 +7,5 @@ require 'active_support/core_ext/string/access' require 'active_support/core_ext/string/iterators' require 'active_support/core_ext/string/xchar' require 'active_support/core_ext/string/behavior' -require 'active_support/core_ext/string/interpolation'
\ No newline at end of file +require 'active_support/core_ext/string/interpolation' +require 'active_support/core_ext/string/output_safety'
\ No newline at end of file |