Merge branch 'fix-oxford-comma' into 'master'

Add a missing Oxford comma in some text on the Activity graph. Resolves #14668. [ci skip] See merge request !3625

Merge branch 'fix-oxford-comma' into 'master'
17a7419d · Robert Speicher · 93571c43 · 6a0f8399 · 17a7419d
Commit 17a7419d authored Apr 08, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

calendar.html.haml app/views/users/calendar.html.haml +1 -1

No files found.
--- a/app/views/users/calendar.html.haml
+++ b/app/views/users/calendar.html.haml
@@ -7,4 +7,4 @@
      '#{user_calendar_activities_path}'
    );

-.calendar-hint Summary of issues, merge requests and push events
+.calendar-hint Summary of issues, merge requests, and push events