From e1252e073a6be072d82f0984332e851190323ef6 Mon Sep 17 00:00:00 2001
From: Andrey Molchanov <neodelf@gmail.com>
Date: Sat, 17 Sep 2016 22:36:13 +0300
Subject: [ci skip] Fixed commas according to Oxford comma in rdoc and guides

---
 actionview/lib/action_view/helpers/date_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionview/lib/action_view/helpers/date_helper.rb')

diff --git a/actionview/lib/action_view/helpers/date_helper.rb b/actionview/lib/action_view/helpers/date_helper.rb
index 61ce1d36e0..04c5fd4218 100644
--- a/actionview/lib/action_view/helpers/date_helper.rb
+++ b/actionview/lib/action_view/helpers/date_helper.rb
@@ -303,7 +303,7 @@ module ActionView
       #   # the sunrise attribute.
       #   time_select("article", "start_time", include_seconds: true)
       #
-      #   # You can set the <tt>:minute_step</tt> to 15 which will give you: 00, 15, 30 and 45.
+      #   # You can set the <tt>:minute_step</tt> to 15 which will give you: 00, 15, 30, and 45.
       #   time_select 'game', 'game_time', {minute_step: 15}
       #
       #   # Creates a time select tag with a custom prompt. Use <tt>prompt: true</tt> for generic prompts.
-- 
cgit v1.2.3