diff options
author | Jon Moss <maclover7@users.noreply.github.com> | 2016-09-17 15:56:30 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-17 15:56:30 -0400 |
commit | 7ccd32412e617884f21edb240df9030b8e3b58ea (patch) | |
tree | 7cba066de186657ac86e9fff566a95ccd32df57a /activesupport | |
parent | 34d2aed03bf7edde8791e8728805a7b7b0d41045 (diff) | |
parent | e1252e073a6be072d82f0984332e851190323ef6 (diff) | |
download | rails-7ccd32412e617884f21edb240df9030b8e3b58ea.tar.gz rails-7ccd32412e617884f21edb240df9030b8e3b58ea.tar.bz2 rails-7ccd32412e617884f21edb240df9030b8e3b58ea.zip |
Merge pull request #26534 from Neodelf/new_branch_name
[ci skip] Fixed commas according to Oxford comma in rdoc and guides
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/lib/active_support/time_with_zone.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb index be2fceb123..f7586efe6a 100644 --- a/activesupport/lib/active_support/time_with_zone.rb +++ b/activesupport/lib/active_support/time_with_zone.rb @@ -133,7 +133,7 @@ module ActiveSupport period.zone_identifier.to_s end - # Returns a string of the object's date, time, zone and offset from UTC. + # Returns a string of the object's date, time, zone, and offset from UTC. # # Time.zone.now.inspect # => "Thu, 04 Dec 2014 11:00:25 EST -05:00" def inspect |