aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-11-26 10:59:23 -0800
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-11-26 10:59:23 -0800
commit17d64a1c5268ec3147de4709517e6607bf96054a (patch)
tree09b78104897ddb161794c3987d63eaf55ba531ae
parent924018ff5cbc7c780b892ffef6a63c232130cc52 (diff)
parent767879c5d8815598055fc1af209eb0912be6da7b (diff)
downloadrails-17d64a1c5268ec3147de4709517e6607bf96054a.tar.gz
rails-17d64a1c5268ec3147de4709517e6607bf96054a.tar.bz2
rails-17d64a1c5268ec3147de4709517e6607bf96054a.zip
Merge pull request #8325 from steveklabnik/backport_7997
@steveklabnik can't spell 'distance.' [ci skip]
-rw-r--r--actionpack/CHANGELOG.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 51518684d7..d20a949454 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,6 +1,6 @@
## Rails 3.2.10 (unreleased) ##
-* Add i18n scope to disance_of_time_in_words. [Backport #7997] *Steve Klabnik*
+* Add i18n scope to distance_of_time_in_words. [Backport #7997] *Steve Klabnik*
* Fix side effect of `url_for` changing the `:controller` string option. [Backport #6003]
Before: