aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-10-03 00:42:17 -0700
committerYves Senn <yves.senn@gmail.com>2013-10-03 00:42:17 -0700
commit5f5b88fc5ef543c34e1ae20fe65ffbf759e465e0 (patch)
tree93bcd30dfa655c81d57cd1fd2a8ea83f2e85151b
parent7768c2a7f3142b422c90dfea451f74643994be52 (diff)
parenta4f086dd9de88ed4915f84c01974132fce186f6e (diff)
downloadrails-5f5b88fc5ef543c34e1ae20fe65ffbf759e465e0.tar.gz
rails-5f5b88fc5ef543c34e1ae20fe65ffbf759e465e0.tar.bz2
rails-5f5b88fc5ef543c34e1ae20fe65ffbf759e465e0.zip
Merge pull request #12430 from vipulnsward/changelog_fix
`intiantiated` => `instantiated` [ci skip]
-rw-r--r--activerecord/CHANGELOG.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 8ee38fc92a..83c94caa53 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -10,7 +10,7 @@
*Yves Senn*
-* Objects intiantiated using a null relationship will now retain the
+* Objects instantiated using a null relationship will now retain the
attributes of the where clause.
Fixes #11676, #11675, #11376.