aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-11-26 10:52:18 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-11-26 10:52:18 -0800
commitb3660ac33539e668228acc0e58926201f969a506 (patch)
tree5c463ad99ac6c93198fb677d2c002a7dcd7ee8e2 /actionpack
parent586bc593c7ef3a1e7a9aa01dde1cf5d908f0e68b (diff)
parentaa996c3c07a4558f87b82831fe3bd5437d414ea0 (diff)
downloadrails-b3660ac33539e668228acc0e58926201f969a506.tar.gz
rails-b3660ac33539e668228acc0e58926201f969a506.tar.bz2
rails-b3660ac33539e668228acc0e58926201f969a506.zip
Merge pull request #8324 from steveklabnik/changelog_7997
@steveklabnik can't spell 'distance.'
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 9301ba1d51..64cd03859d 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,6 +1,6 @@
## Rails 4.0.0 (unreleased) ##
-* Add i18n scope to disance_of_time_in_words. *Steve Klabnik*
+* Add i18n scope to distance_of_time_in_words. *Steve Klabnik*
* `assert_template`:
- is no more passing with empty string.