summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2015-05-03 20:57:51 +0200
committerRobert Schilling <rschilling@student.tugraz.at>2015-05-03 20:57:51 +0200
commite22936c60f44f96db497b2355379d86c9b69b8d8 (patch)
tree435d70e7efd4a2d3411523e0258d0ef2d99acfa5
parent05ca93866adfc8a67676a5793c4fba1bc0e26c47 (diff)
parent45529c87efd6a4f79bc149415339aeeb8779fd93 (diff)
downloadgitlab-ce-e22936c60f44f96db497b2355379d86c9b69b8d8.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r--CHANGELOG2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 6c73e8e1637..8456975639a 100644
--- 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.