aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-04-29 16:22:54 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-04-29 16:22:54 -0700
commit55fefdb8abce9a3d7b13bc1c406ad5ae0df4e060 (patch)
tree3d9d5c51b617ca2957dd68f10be32d50f296aceb
parenta89827e97c7e8887ca23e1279a481d548f63b262 (diff)
parentc6e0bc600b25b8d0ca65f95cf39b2e51aa0e0337 (diff)
downloadrails-55fefdb8abce9a3d7b13bc1c406ad5ae0df4e060.tar.gz
rails-55fefdb8abce9a3d7b13bc1c406ad5ae0df4e060.tar.bz2
rails-55fefdb8abce9a3d7b13bc1c406ad5ae0df4e060.zip
Merge pull request #6067 from Locke23rus/patch-2
Fix typo
-rw-r--r--activesupport/CHANGELOG.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 66319898e2..92713cae85 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,6 +1,6 @@
## Rails 4.0.0 (unreleased) ##
-* Add ActiveSupport::Deprecations.behavior = :slience to completely ignore *twinturbo*
+* Add `ActiveSupport::Deprecations.behavior = :silence` to completely ignore *twinturbo*
* Make Module#delegate stop using `send` - can no longer delegate to private methods. *dasch*