diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-12-18 01:12:08 -0800 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-12-18 01:12:08 -0800 |
| commit | 8ac78d81b1c578572e99caa58eba488b63d2801e (patch) | |
| tree | 13d3dafe885a3192cf8894d128987907da512a06 /activesupport | |
| parent | 2c9cb495f379856704b3f23da71fb60bc5a332d5 (diff) | |
| parent | 29712f0cbc6536de01b58912fe86dea8f83f9406 (diff) | |
| download | rails-8ac78d81b1c578572e99caa58eba488b63d2801e.tar.gz rails-8ac78d81b1c578572e99caa58eba488b63d2801e.tar.bz2 rails-8ac78d81b1c578572e99caa58eba488b63d2801e.zip | |
Merge pull request #13367 from abhishekjain16/new_branch
change to DateTime.civil_from_format from DateTime.civil_from_fromat in ...
[ci skip]
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index c830ee61e6..a434c98655 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -347,7 +347,7 @@ *Arun Agrawal* -* Remove deprecated `DateTime.local_offset` in favor of `DateTime.civil_from_fromat`. +* Remove deprecated `DateTime.local_offset` in favor of `DateTime.civil_from_format`. *Arun Agrawal* |