Merge branch 'master' of github.com:gitlabhq/gitlabhq

e22936c6 · Robert Schilling · 05ca9386 · 45529c87 · e22936c6
Commit e22936c6 authored May 03, 2015 by Robert Schilling
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

CHANGELOG CHANGELOG +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,7 +22,7 @@ v 7.11.0 (unreleased)
  -
  - Show Atom feed buttons everywhere where applicable.
  - Add project activity atom feed.
-  - Don't crash when an MR from a fork has a cross-reference comment from the target project on of its commits.
+  - Don't crash when an MR from a fork has a cross-reference comment from the target project on one of its commits.
  - Include commit comments in MR from a forked project.
  - Fix adding new group members from admin area
  - Group milestones by title in the dashboard and all other issue views.