diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-10-10 17:15:11 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-10-10 17:15:11 +0100 |
| commit | 66ee2654ff243f03595a402fa15e1eea1b5b45be (patch) | |
| tree | 3f1055e03082f0c767719e8cba5155e4207779e0 /activesupport/lib/active_support/core_ext/string.rb | |
| parent | dd2779e1b83b4d867d47dd286ec0c919f5df12a9 (diff) | |
| parent | b9ce8216fa849a47ad0b0f99fa510e226a23c12e (diff) | |
| download | rails-66ee2654ff243f03595a402fa15e1eea1b5b45be.tar.gz rails-66ee2654ff243f03595a402fa15e1eea1b5b45be.tar.bz2 rails-66ee2654ff243f03595a402fa15e1eea1b5b45be.zip | |
Merge commit 'mainstream/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 |